JamesSingleton · JamesSingleton · Jan 27, 2025 · Jan 27, 2025 · Jan 27, 2025
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/apps/admin/.eslintrc.json b/apps/admin/.eslintrc.json
diff --git a/apps/admin/eslint.config.mjs b/apps/admin/eslint.config.mjs
@@ -0,0 +1,4 @@
+import { nextJsConfig } from "@repo/eslint-config/next-js";
+
+/** @type {import("eslint").Linter.Config} */
+export default nextJsConfig;
diff --git a/apps/admin/package.json b/apps/admin/package.json
@@ -13,36 +13,37 @@
   "dependencies": {
     "@radix-ui/react-avatar": "^1.1.2",
     "@radix-ui/react-collapsible": "^1.1.2",
-    "@radix-ui/react-dialog": "^1.1.4",
-    "@radix-ui/react-dropdown-menu": "^2.1.4",
+    "@radix-ui/react-dialog": "^1.1.5",
+    "@radix-ui/react-dropdown-menu": "^2.1.5",
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-separator": "^1.1.1",
     "@radix-ui/react-slot": "^1.1.1",
-    "@radix-ui/react-tooltip": "^1.1.6",
+    "@radix-ui/react-tooltip": "^1.1.7",
     "@repo/ui": "workspace:*",
-    "@tanstack/react-query": "^5.59.20",
+    "@tanstack/react-query": "^5.64.2",
     "@tanstack/react-table": "^8.20.6",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "geist": "^1.3.1",
-    "lucide-react": "^0.469.0",
-    "next": "^15.1.3",
+    "lucide-react": "^0.474.0",
+    "next": "^15.1.6",
     "next-themes": "^0.4.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
-    "@types/react": "^19.0.2",
-    "@types/react-dom": "^19.0.2",
+    "@repo/eslint-config": "workspace:*",
+    "@types/node": "^22.10.10",
+    "@types/react": "^19.0.8",
+    "@types/react-dom": "^19.0.3",
     "autoprefixer": "^10.4.20",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^15.0.3",
-    "eslint-config-prettier": "^9.1.0",
-    "postcss": "^8.4.49",
+    "eslint": "^9.19.0",
+    "eslint-config-next": "^15.1.6",
+    "eslint-config-prettier": "^10.0.1",
+    "postcss": "^8.5.1",
     "tailwindcss": "^3.4.17",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.3"
   }
 }
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -9,6 +9,7 @@
   },
   "author": "",
   "devDependencies": {
-    "electron": "^33.2.1"
+    "electron": "^33.2.1",
+    "eslint": "^9.19.0"
   }
 }
diff --git a/apps/web/.eslintrc.json b/apps/web/.eslintrc.json
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
@@ -29,13 +29,13 @@ export default function RootLayout({
   children,
 }: {
   children: React.ReactNode;
-}): JSX.Element {
+}) {
   return (
     <html lang="en" suppressHydrationWarning>
       <body
         className={cn(
           `${GeistSans.variable} ${GeistMono.variable}`,
-          "bg-background overflow-x-hidden",
+          "bg-background overflow-x-hidden"
         )}
       >
         <ThemeProvider

diff --git a/apps/web/components/cta.tsx b/apps/web/components/cta.tsx
@@ -8,7 +8,7 @@ export function CTA() {
         Effortless Team Management with Project Aqua.
       </span>
       <p className="text-muted-foreground mt-6">
-        Simplify swim team management with Project Aqua's user-friendly
+        Simplify swim team management with Project Aqua&apos;s user-friendly
         platform. Spend less time on admin tasks and more time coaching your
         team to greatness.
       </p>

diff --git a/apps/web/components/features.tsx b/apps/web/components/features.tsx
@@ -34,7 +34,7 @@ export default function Features() {
           <TrendingUpIcon className=" h-10 w-10 mb-4" />
           <h2 className="text-2xl font-semibold mb-2">Performance Tracking</h2>
           <p className="text-secondary-foreground">
-            Monitor your team's progress with advanced analytics.
+            Monitor your team&apos;s progress with advanced analytics.
           </p>
         </div>
         <div className="col-span-1 sm:col-span-1 lg:col-span-1 xl:col-span-2 row-span-2 flex flex-col items-center justify-center bg-secondary p-6 rounded-lg text-center">
@@ -48,7 +48,7 @@ export default function Features() {
           <BarChartIcon className=" h-10 w-10 mb-4" />
           <h2 className="text-2xl font-semibold mb-2">Team Analytics</h2>
           <p className="text-secondary-foreground">
-            Dive deep into your team's performance with detailed analytics.
+            Dive deep into your team&apos;s performance with detailed analytics.
           </p>
         </div>
         <div className="col-span-1 sm:col-span-2 lg:col-span-2 xl:col-span-3 row-span-3 flex flex-col items-center justify-center bg-secondary p-6 rounded-lg text-center">

diff --git a/apps/web/eslint.config.mjs b/apps/web/eslint.config.mjs
@@ -0,0 +1,4 @@
+import { nextJsConfig } from "@repo/eslint-config/next-js";
+
+/** @type {import("eslint").Linter.Config} */
+export default nextJsConfig;
diff --git a/apps/web/next-env.d.ts b/apps/web/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -11,36 +11,36 @@
     "prettier:write": "prettier --write ."
   },
   "dependencies": {
-    "@react-email/components": "^0.0.28",
+    "@react-email/components": "^0.0.32",
     "@repo/ui": "workspace:*",
-    "@vercel/analytics": "^1.3.2",
-    "class-variance-authority": "^0.7.0",
+    "@vercel/analytics": "^1.4.1",
+    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
-    "framer-motion": "^11.11.11",
+    "framer-motion": "^12.0.6",
     "geist": "^1.3.1",
-    "lucide-react": "^0.456.0",
-    "next": "^15.0.3",
-    "next-themes": "^0.4.3",
-    "react": "^18.3.1",
-    "react-day-picker": "^9.1.1",
-    "react-dom": "^18.3.1",
-    "resend": "^4.0.0",
-    "tailwind-merge": "^2.5.4",
+    "lucide-react": "^0.474.0",
+    "next": "^15.1.6",
+    "next-themes": "^0.4.4",
+    "react": "^19.0.0",
+    "react-day-picker": "^9.5.1",
+    "react-dom": "^19.0.0",
+    "resend": "^4.1.1",
+    "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
     "@types/eslint": "^9.6.1",
-    "@types/node": "^22.9.0",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
+    "@types/node": "^22.10.10",
+    "@types/react": "^19.0.8",
+    "@types/react-dom": "^19.0.3",
     "autoprefixer": "^10.4.20",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^15.0.3",
-    "postcss": "^8.4.48",
+    "eslint": "^9.19.0",
+    "eslint-config-next": "^15.1.6",
+    "postcss": "^8.5.1",
     "tailwindcss": "^3.4.14",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.3"
   }
 }
diff --git a/packages/eslint-config/base.js b/packages/eslint-config/base.js
@@ -0,0 +1,32 @@
+import js from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import turboPlugin from "eslint-plugin-turbo";
+import tseslint from "typescript-eslint";
+import onlyWarn from "eslint-plugin-only-warn";
+
+/**
+ * A shared ESLint configuration for the repository.
+ *
+ * @type {import("eslint").Linter.Config}
+ * */
+export const config = [
+  js.configs.recommended,
+  eslintConfigPrettier,
+  ...tseslint.configs.recommended,
+  {
+    plugins: {
+      turbo: turboPlugin,
+    },
+    rules: {
+      "turbo/no-undeclared-env-vars": "warn",
+    },
+  },
+  {
+    plugins: {
+      onlyWarn,
+    },
+  },
+  {
+    ignores: ["dist/**"],
+  },
+];
diff --git a/packages/eslint-config/library.js b/packages/eslint-config/library.js
diff --git a/packages/eslint-config/next.js b/packages/eslint-config/next.js
@@ -1,35 +1,49 @@
-const { resolve } = require("node:path");
+import js from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import tseslint from "typescript-eslint";
+import pluginReactHooks from "eslint-plugin-react-hooks";
+import pluginReact from "eslint-plugin-react";
+import globals from "globals";
+import pluginNext from "@next/eslint-plugin-next";
+import { config as baseConfig } from "./base.js";
 
-const project = resolve(process.cwd(), "tsconfig.json");
-
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: [
-    "eslint:recommended",
-    "prettier",
-    require.resolve("@vercel/style-guide/eslint/next"),
-    "turbo",
-  ],
-  globals: {
-    React: true,
-    JSX: true,
+/**
+ * A custom ESLint configuration for libraries that use Next.js.
+ *
+ * @type {import("eslint").Linter.Config}
+ * */
+export const nextJsConfig = [
+  ...baseConfig,
+  js.configs.recommended,
+  eslintConfigPrettier,
+  ...tseslint.configs.recommended,
+  {
+    ...pluginReact.configs.flat.recommended,
+    languageOptions: {
+      ...pluginReact.configs.flat.recommended.languageOptions,
+      globals: {
+        ...globals.serviceworker,
+      },
+    },
   },
-  env: {
-    node: true,
-    browser: true,
+  {
+    plugins: {
+      "@next/next": pluginNext,
+    },
+    rules: {
+      ...pluginNext.configs.recommended.rules,
+      ...pluginNext.configs["core-web-vitals"].rules,
+    },
   },
-  plugins: ["only-warn"],
-  settings: {
-    "import/resolver": {
-      typescript: {
-        project,
-      },
+  {
+    plugins: {
+      "react-hooks": pluginReactHooks,
+    },
+    settings: { react: { version: "detect" } },
+    rules: {
+      ...pluginReactHooks.configs.recommended.rules,
+      // React scope no longer necessary with new JSX transform.
+      "react/react-in-jsx-scope": "off",
     },
   },
-  ignorePatterns: [
-    // Ignore dotfiles
-    ".*.js",
-    "node_modules/",
-  ],
-  overrides: [{ files: ["*.js?(x)", "*.ts?(x)"] }],
-};
+];
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,19 +1,25 @@
 {
   "name": "@repo/eslint-config",
   "version": "0.0.0",
+  "type": "module",
   "private": true,
-  "files": [
-    "library.js",
-    "next.js",
-    "react-internal.js"
-  ],
+  "exports": {
+    "./base": "./base.js",
+    "./next-js": "./next.js",
+    "./react-internal": "./react-internal.js"
+  },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.13.0",
-    "@typescript-eslint/parser": "^8.13.0",
-    "@vercel/style-guide": "^6.0.0",
-    "eslint-config-prettier": "^9.1.0",
+    "@eslint/js": "^9.19.0",
+    "@next/eslint-plugin-next": "^15.1.6",
+    "eslint": "^9.19.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-config-turbo": "^2.2.3",
     "eslint-plugin-only-warn": "^1.1.0",
-    "typescript": "^5.6.3"
+    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-turbo": "^2.3.4",
+    "globals": "^15.14.0",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.21.0"
   }
 }