chore: Fix eslint & typescript errors

CrawlerCode · CrawlerCode · commit d9c58959c60a · 2025-02-09T18:41:39.000+01:00
- Update nx
- Add eslint to workspace
- Reorganized tsconfigs
- Fix errors
diff --git a/eslint.config.js b/eslint.config.js
@@ -10,11 +10,12 @@ export const defaultESLintIgnores = [
   "**/jest.config.js",
   "**/eslint.config.js",
   "**/payload-types.ts",
-  "dev/src/app/(payload)/",
+  "packages/dev/src/app/(payload)/",
   "**/dist/",
   "**/build/",
   "**/node_modules/",
   "**/temp/",
+  "examples/",
 ];
 
 export default [
@@ -31,7 +32,6 @@ export default [
       "perfectionist/sort-jsx-props": "off",
     },
   },
-  // TODO: Bring in '@payloadcms/eslint-plugin' for 'payload/proper-payload-logger-usage' rule
   {
     ignores: defaultESLintIgnores,
   },
diff --git a/examples/basic/eslint.config.mjs b/examples/basic/eslint.config.mjs
@@ -1,35 +1,38 @@
-import { dirname } from 'path'
-import { fileURLToPath } from 'url'
-import { FlatCompat } from '@eslint/eslintrc'
+import { FlatCompat } from "@eslint/eslintrc";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
 
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 const compat = new FlatCompat({
   baseDirectory: __dirname,
-})
+});
 
 const eslintConfig = [
-  ...compat.extends('next/core-web-vitals', 'next/typescript'),
+  ...compat.extends("next/core-web-vitals", "next/typescript"),
+  {
+    ignores: ["src/app/(payload)/"],
+  },
   {
     rules: {
-      '@typescript-eslint/ban-ts-comment': 'warn',
-      '@typescript-eslint/no-empty-object-type': 'warn',
-      '@typescript-eslint/no-explicit-any': 'warn',
-      '@typescript-eslint/no-unused-vars': [
-        'warn',
+      "@typescript-eslint/ban-ts-comment": "warn",
+      "@typescript-eslint/no-empty-object-type": "warn",
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/no-unused-vars": [
+        "warn",
         {
-          vars: 'all',
-          args: 'after-used',
+          vars: "all",
+          args: "after-used",
           ignoreRestSiblings: false,
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_',
-          destructuredArrayIgnorePattern: '^_',
-          caughtErrorsIgnorePattern: '^(_|ignore)',
+          argsIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          caughtErrorsIgnorePattern: "^(_|ignore)",
         },
       ],
     },
   },
-]
+];
 
-export default eslintConfig
+export default eslintConfig;
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -23,18 +23,20 @@
     "next": "15.1.6",
     "next-auth": "5.0.0-beta.25",
     "payload": "^3.21.0",
+    "payload-authjs": "workspace:*",
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "sharp": "0.33.5",
-    "payload-authjs": "workspace:*"
+    "sharp": "0.33.5"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",
+    "@next/eslint-plugin-next": "^15.1.6",
     "@types/node": "^22.13.1",
     "@types/react": "19.0.8",
     "@types/react-dom": "19.0.3",
-    "eslint": "^9.19.0",
+    "eslint": "^9.20.0",
     "eslint-config-next": "15.1.6",
+    "eslint-plugin-react-hooks": "^5.1.0",
     "typescript": "5.7.3"
   },
   "engines": {
diff --git a/examples/basic/tsconfig.json b/examples/basic/tsconfig.json
@@ -1,14 +1,15 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
     "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
@@ -21,8 +22,7 @@
     "paths": {
       "@/*": ["./src/*"],
       "@payload-config": ["./src/payload.config.ts"]
-    },
-    "target": "ES2022"
+    }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]
diff --git a/package.json b/package.json
@@ -8,13 +8,14 @@
     "dev": "nx run dev:dev"
   },
   "devDependencies": {
-    "@nx/eslint": "20.4.0",
-    "@nx/js": "20.4.0",
-    "@nx/next": "20.4.0",
-    "@nx/react": "20.4.0",
+    "@nx/eslint": "20.4.2",
+    "@nx/js": "20.4.2",
+    "@nx/next": "20.4.2",
+    "@nx/react": "20.4.2",
     "@payloadcms/eslint-config": "3.9.0",
-    "nx": "20.4.0",
-    "prettier": "^3.4.2",
+    "eslint": "^9.20.0",
+    "nx": "20.4.2",
+    "prettier": "^3.5.0",
     "typescript": "^5.7.3"
   },
   "nx": {},
diff --git a/packages/dev/src/app/(app)/page.tsx b/packages/dev/src/app/(app)/page.tsx
@@ -10,7 +10,7 @@ import { SignInOrOutButtons } from "../components/auth/SignInOrOutButtons";
 import ExampleList from "../components/ExampleList";
 import { Tabs } from "../components/general/Tabs";
 
-const Page = async () => {
+const Page = () => {
   return (
     <main className="container mt-5">
       <SignInOrOutButtons />
diff --git a/packages/dev/src/auth.config.ts b/packages/dev/src/auth.config.ts
@@ -36,7 +36,7 @@ export const authConfig: NextAuthConfig = {
           // Default fields (@see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/providers/github.ts#L176)
           id: profile.id.toString(),
           name: profile.name ?? profile.login,
-          email: profile.email!,
+          email: profile.email,
           image: profile.avatar_url,
           // Custom fields
           additionalUserDatabaseField: `Create by github provider profile callback at ${new Date().toISOString()}`,
diff --git a/packages/dev/src/auth.ts b/packages/dev/src/auth.ts
@@ -10,8 +10,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth(
       /**
        * Update user on every sign in
        */
-      signIn: async ({ adapter, payload, user, profile }) => {
-        payload?.logger.info("signIn event");
+      signIn: async ({ adapter, user, profile }) => {
         if (!user.id || !profile) {
           return;
         }
diff --git a/packages/dev/src/payload/components/Greeting.tsx b/packages/dev/src/payload/components/Greeting.tsx
@@ -1,15 +1,17 @@
 "use client";
 
 import { Banner, useAuth } from "@payloadcms/ui";
-import { User } from "payload/generated-types";
+import { type User } from "payload/generated-types";
 
 /**
  * Greeting banner that displays the current user
  */
 const Greeting = () => {
   const { user } = useAuth<User>();
 
-  if (!user) return null;
+  if (!user) {
+    return null;
+  }
 
   return (
     <Banner type="success">
diff --git a/packages/dev/tsconfig.json b/packages/dev/tsconfig.json
@@ -2,17 +2,14 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": ".",
-    "target": "ESNext",
+    "moduleResolution": "bundler",
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "jsx": "preserve",
     "allowJs": true,
-    "strict": true,
+    "resolveJsonModule": true,
     "esModuleInterop": true,
-    "jsx": "preserve",
     "noEmit": true,
     "incremental": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
     "isolatedModules": true,
     "plugins": [
       {
@@ -28,6 +25,6 @@
       "payload-authjs/client": ["../payload-authjs/src/client.ts"]
     }
   },
-  "include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "postcss.config.mjs"],
   "exclude": ["node_modules", "dist", "build"]
 }
diff --git a/packages/payload-authjs/src/authjs/withPayload.ts b/packages/payload-authjs/src/authjs/withPayload.ts
@@ -135,7 +135,7 @@ export function withPayload(
       await customEvent?.({
         ...message,
         // Add the adapter to the event
-        adapter: authjsConfig.adapter!,
+        adapter: authjsConfig.adapter,
         // Add payload to the event
         payload: options.payload
           ? await options.payload
diff --git a/packages/payload-authjs/src/payload/collection/hooks/refresh.ts b/packages/payload-authjs/src/payload/collection/hooks/refresh.ts
@@ -1,5 +1,5 @@
 import NextAuth from "next-auth";
-import { CollectionConfig, Forbidden, type CollectionRefreshHook } from "payload";
+import { type CollectionConfig, type CollectionRefreshHook, Forbidden } from "payload";
 import { withPayload } from "../../../authjs/withPayload";
 import type { AuthjsPluginConfig } from "../../plugin";
 import { getAllVirtualFields } from "../../utils/getAllVirtualFields";
@@ -27,7 +27,7 @@ export const refreshHook: (
         userCollectionSlug: pluginOptions.userCollectionSlug,
       }),
     );
-    let session = await auth();
+    const session = await auth();
 
     // If no session user, throw forbidden
     if (!session?.user) {
diff --git a/packages/payload-authjs/src/payload/utils/mergeFields.ts b/packages/payload-authjs/src/payload/utils/mergeFields.ts
@@ -1,4 +1,4 @@
-import { deepCopyObjectSimple, deepMerge, NamedTab, Tab, type Field } from "payload";
+import { deepCopyObjectSimple, deepMerge, type Field, type NamedTab, type Tab } from "payload";
 import { fieldAffectsData, tabHasName } from "payload/shared";
 
 /**
@@ -96,7 +96,9 @@ export const mergeFields = ({
             });
             existingTab.fields = [...result.mergedFields, ...result.restFields];
             const { fields: _, ...restTab } = tab;
-            if (tab.custom?.originalTabLabel && tab.label) delete existingTab.label;
+            if (tab.custom?.originalTabLabel && tab.label) {
+              delete existingTab.label;
+            }
             Object.assign(existingTab, deepMerge<Tab>(restTab, existingTab));
 
             // Remove tab
diff --git a/packages/payload-authjs/tsconfig.json b/packages/payload-authjs/tsconfig.json
@@ -1,10 +1,9 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "strict": true,
+    "baseUrl": ".",
     "moduleResolution": "bundler",
-    "jsx": "react-jsx",
-    "esModuleInterop": true,
+    "jsx": "preserve",
     "lib": ["DOM", "DOM.Iterable", "ESNext"]
   },
   "files": [],
diff --git a/packages/payload-authjs/tsconfig.lib.json b/packages/payload-authjs/tsconfig.lib.json
@@ -3,5 +3,5 @@
   "compilerOptions": {
     "declaration": true
   },
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.base.json b/tsconfig.base.json
