merge base into branch, fix new issues

Author: DaltheCow

.eslintrc.json

@@ -13,18 +13,13 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:prettier/recommended"
   ],
-  "ignorePatterns": [".vscode"],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaFeatures": {
       "jsx": true
     },
     "ecmaVersion": 2024,
-    "project": [
-      "src/ui/tsconfig.json",
-      "src/ui/tsconfig.test.json",
-      "src/ui/tsconfig.cypress.json"
-    ],
+    "project": ["src/ui/tsconfig.json", "tsconfig.test.json", "tsconfig.cypress.json"],
     "sourceType": "module"
   },
   "plugins": ["@typescript-eslint", "import", "jest", "no-secrets", "react"],
@@ -60,13 +55,13 @@
     "no-secrets/no-secrets": ["error", { "additionalRegexes": {}, "ignoreContent": [] }]
   },
   "settings": {
-    "next": { "rootDir": ["src/ui/"] },
+    "next": { "rootDir": ["src/ui/", "tests/ui/"] },
     "import/resolver": {
       "typescript": {
         "project": [
           "src/ui/tsconfig.json",
-          "src/ui/tsconfig.test.json",
-          "src/ui/tsconfig.cypress.json"
+          "tsconfig.test.json",
+          "tsconfig.cypress.json"
         ]
       }
     }

.github/workflows/development.yml

@@ -31,11 +31,9 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
-        working-directory: src/ui
 
       - name: Run quality and typing checks
         run: npm run lint
-        working-directory: src/ui
 
   type-checks:
     runs-on: ubuntu-latest
@@ -63,11 +61,9 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
-        working-directory: src/ui
 
       - name: Run quality and typing checks
         run: npm run type-check
-        working-directory: src/ui
 
   precommit-checks:
     runs-on: ubuntu-latest
@@ -94,12 +90,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install dependencies
-        working-directory: src/ui
         run: npm ci
 
       - name: Run pre-commit checks
         run: npx husky run pre-commit
-        working-directory: src/ui
 
   unit-tests:
     runs-on: ubuntu-latest
@@ -127,11 +121,9 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
-        working-directory: src/ui
 
       - name: Run unit tests
         run: npm run test:unit
-        working-directory: src/ui
 
   integration-tests:
     runs-on: ubuntu-latest
@@ -159,11 +151,9 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
-        working-directory: src/ui
 
       - name: Run integration tests
         run: npm run test:integration
-        working-directory: src/ui
 
   build:
     runs-on: ubuntu-latest

.gitignore

@@ -214,12 +214,14 @@ yarn-error.log*
 src/ui/.vercel
 
 # typescript
-src/ui/*.tsbuildinfo
+*.tsbuildinfo
 src/ui/next-env.d.ts
 
 # Root-level UI config files that should be tracked
 !package.json
 !package-lock.json
 !.eslintrc.json
+!tsconfig.json
 !tsconfig.*.json
 !src/ui/lib
+!src/ui/public/manifest.json

.prettierignore

@@ -1,6 +1,18 @@
-/bin
-/build
-/public
-/.meta
-/.next
-/out
+# === Don't touch ===
+*.md
+*.mdx
+*.yaml
+*.yml
+
+# === Skip all JSON …
+*.json
+
+# === include relevant json ===
+!src/ui/**/*.json
+!tests/ui/**/*.json
+
+# Root-level configs to format
+!/.eslintrc.json
+!/tsconfig*.json
+!/*.config.{js,ts}
+!/jest.setup.ts

cypress.config.ts

@@ -2,8 +2,8 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   e2e: {
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
+    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
   },
 });

jest.config.js

@@ -1,25 +1,30 @@
+const path = require('path');
 const nextJest = require('next/jest');
 
 const createJestConfig = nextJest({
-  dir: __dirname,
+  dir: path.resolve(__dirname, 'src/ui'),
 });
 
 const customJestConfig = {
-  collectCoverage: false,
-  collectCoverageFrom: ['tests'],
-  coverageDirectory: './.meta',
-  coverageReporters: ['json-summary'],
+  collectCoverage: true,
+  collectCoverageFrom: ['./src/ui/**/*.{ts,tsx}'],
+  coverageDirectory: './coverage',
+  coverageProvider: 'v8',
+  coverageReporters: ['json', 'text-summary', 'lcov'],
   moduleFileExtensions: ['ts', 'tsx', 'js'],
   moduleNameMapper: {
     '^.+\\.(svg)$': '<rootDir>/tests/ui/__mocks__/svg.js',
     '^@/(.*)$': '<rootDir>/src/$1',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/tests/ui/__mocks__/fileMock.js',
     '\\.(css|less|scss|sass)$': '<rootDir>/tests/ui/__mocks__/styleMock.js',
-    '^@/(.*)$': '<rootDir>/$1',
   },
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
   testEnvironment: 'jest-environment-jsdom',
+  testMatch: [
+    '<rootDir>/tests/ui/unit/**/*.(test|spec).{ts,tsx,js,jsx}',
+    '<rootDir>/tests/ui/integration/**/*.(test|spec).{ts,tsx,js,jsx}',
+  ],
 };
 
 module.exports = createJestConfig(customJestConfig);