merge base, fix some issues, but not all

Author: DaltheCow

ui/.eslintrc.json .eslintrc.jsonui/.eslintrc.json renamed to .eslintrc.json

@@ -1,8 +1,9 @@
 {
   "env": {
     "browser": true,
-    "es6": true,
-    "jest": true
+    "es2024": true,
+    "jest": true,
+    "node": true
   },
   "extends": [
     "eslint:recommended",
@@ -12,23 +13,13 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:prettier/recommended"
   ],
-  "ignorePatterns": [".vscode", "jest.config.js"],
-  "overrides": [
-    {
-      "files": ["*.mjs"],
-      "parser": "espree", // Use the default JavaScript parser for `.mjs` files
-      "parserOptions": {
-        "sourceType": "module"
-      }
-    }
-  ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaFeatures": {
       "jsx": true
     },
-    "ecmaVersion": 2018,
-    "project": "./tsconfig.json",
+    "ecmaVersion": 2024,
+    "project": ["src/ui/tsconfig.json", "tsconfig.test.json", "tsconfig.cypress.json"],
     "sourceType": "module"
   },
   "plugins": ["@typescript-eslint", "import", "jest", "no-secrets", "react"],
@@ -46,7 +37,7 @@
         "newlines-between": "always-and-inside-groups",
         "pathGroups": [
           {
-            "pattern": "{@,assets,classes,components,hooks,pages,store,tests,types,utils}/**",
+            "pattern": "@{app,assets,classes,components,hooks,lib,pages,store,tests,types,utils}/**",
             "group": "internal",
             "position": "before"
           },
@@ -86,5 +77,17 @@
         "caughtErrorsIgnorePattern": "^_"
       }
     ]
+  },
+  "settings": {
+    "next": { "rootDir": ["src/ui/", "tests/ui/"] },
+    "import/resolver": {
+      "typescript": {
+        "project": [
+          "src/ui/tsconfig.json",
+          "tsconfig.test.json",
+          "tsconfig.cypress.json"
+        ]
+      }
+    }
   }
 }

.github/workflows/development.yml

@@ -21,6 +21,20 @@ jobs:
       - name: Run quality checks
         run: tox -e quality
 
+  ui-quality-checks:
+    permissions:
+      contents: "read"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run quality and typing checks
+        run: npm run lint
+
   type-checks:
     runs-on: ubuntu-latest
     strategy:
@@ -37,6 +51,20 @@ jobs:
       - name: Run quality checks
         run: tox -e types
 
+  ui-type-checks:
+    permissions:
+      contents: "read"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run quality and typing checks
+        run: npm run type-check
+
   precommit-checks:
     runs-on: ubuntu-latest
     strategy:
@@ -53,6 +81,20 @@ jobs:
       - name: Run pre-commit checks
         run: pre-commit run --all-files
 
+  ui-precommit-check:
+    permissions:
+      contents: "read"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run pre-commit checks
+        run: npx husky run pre-commit
+
   unit-tests:
     runs-on: ubuntu-latest
     strategy:
@@ -69,6 +111,20 @@ jobs:
       - name: Run unit tests
         run: tox -e test-unit -- -m "smoke or sanity"
 
+  ui-unit-tests:
+    permissions:
+      contents: "read"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run unit tests
+        run: npm run test:unit
+
   integration-tests:
     runs-on: ubuntu-latest
     strategy:
@@ -85,6 +141,20 @@ jobs:
       - name: Run integration tests
         run: tox -e test-integration -- -m smoke
 
+  ui-integration-tests:
+    permissions:
+      contents: "read"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run integration tests
+        run: npm run test:integration
+
   build:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/ui-development.yml

@@ -179,5 +179,49 @@ cython_debug/
 *.json
 *.yaml
 
-# Turn off UI related ignores, defer to ui/.gitignore
-!ui/**
+
+# UI Section - Next.js/React application under src/ui/
+# dependencies
+/node_modules/
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+coverage/
+
+# next.js
+/src/ui/.next/
+/src/ui/out/
+
+# production
+build/
+
+# misc
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# vercel
+src/ui/.vercel
+
+# typescript
+*.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

.gitignore

@@ -0,0 +1,18 @@
+# === 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

.prettierignore

@@ -2,9 +2,8 @@
   "arrowParens": "always",
   "bracketSameLine": false,
   "bracketSpacing": true,
-  "jsxBracketSameLine": false,
   "jsxSingleQuote": false,
-  "printWidth": 100,
+  "printWidth": 88,
   "semi": true,
   "singleQuote": true,
   "tabWidth": 2,