merge base

Author: DaltheCow

cypress.config.ts

@@ -4,6 +4,6 @@ export default defineConfig({
   e2e: {
     specPattern: 'tests/ui/cypress/e2e/**/*.cy.{js,jsx,ts,tsx}',
     supportFile: 'tests/ui/cypress/support/e2e.ts',
-    baseUrl: 'http://localhost:3000', // optional, but good practice
+    baseUrl: 'http://localhost:3000', // optional
   },
 });

eslint.config.js

@@ -27,7 +27,6 @@ export default tseslint.config(
   },
 
   // 2. Base Configurations (Applied to all files)
-  // These configs are NOT type-aware and are safe to apply globally.
   eslint.configs.recommended,
   prettierConfig, // Disables ESLint rules that conflict with Prettier. IMPORTANT: Must be after other configs.
 
@@ -93,6 +92,7 @@ export default tseslint.config(
       'react/prop-types': 'off',
 
       '@next/next/no-html-link-for-pages': 'off',
+      '@next/next/no-img-element': 'off',
 
       complexity: ['warn', { max: 8 }],
     },

package-lock.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev src/ui",
     "build": "next build src/ui",
-    "lint": "next lint src/ui",
+    "lint": "next lint --fix src/ui",
     "type-check": "tsc -p src/ui/tsconfig.json --noEmit && tsc -p tsconfig.test.json --noEmit && tsc -p tsconfig.cypress.json --noEmit",
     "format": "prettier --write .",
     "prepare": "husky",

package.json

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { NextConfig } from 'next';
 
 const nextConfig: NextConfig = {

src/ui/next.config.ts

@@ -1,15 +1,12 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
-    /* --- language / emit --- */
     "target": "ES2022",
     "lib": ["dom", "dom.iterable", "esnext"],
     "module": "esnext",
     "jsx": "preserve",
     "incremental": true,
     "noEmit": true,
-
-    /* --- module resolution --- */
     "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {
@@ -20,8 +17,6 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "plugins": [{ "name": "next" }],
-
-    /* --- correctness / style --- */
     "strict": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,

tsconfig.base.json

@@ -1,22 +1,10 @@
 {
   "extends": "./tsconfig.base.json",
-
-  /* Extra options that apply only to Node-side files */
   "compilerOptions": {
-    "types": ["node"], // Buffer, process, __dirname, etc.
+    "types": ["node"],
     "allowJs": false,
     "isolatedModules": true
   },
-
-  /* Narrow include so we don’t compile the entire repo twice */
-  "include": [
-    "*.ts",
-    "*.cts",
-    "*.mts", // a couple of root-level scripts
-    "scripts/**/*",
-    "types/**/*"
-  ],
-
-  /* Don’t touch the Next.js source or tests from here */
+  "include": ["*.ts", "*.cts", "*.mts", "scripts/**/*", "types/**/*"],
   "exclude": ["src/ui", "tests", "node_modules"]
 }