merge main and fix conflicts

DaltheCow · DaltheCow · commit 058fb6abaeca · 2025-06-10T10:49:29.000-04:00
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Install dependencies
         run: pip install pre-commit
       - name: Run pre-commit checks
-        run: pre-commit run --all-files
+        run: SKIP=ruff-format pre-commit run --all-files
 
   ui-precommit-check:
     permissions:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Install dependencies
         run: pip install pre-commit
       - name: Run pre-commit checks
-        run: pre-commit run --all-files
+        run: SKIP=ruff-format pre-commit run --all-files
 
   unit-tests:
     runs-on: ubuntu-latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,6 +8,10 @@ repos:
   rev: v0.11.7
   hooks:
     - id: ruff
+      name: run linter
+      args: [ --fix, --show-fixes ]
+    - id: ruff-format
+      name: run formatter
 - repo: https://github.com/pre-commit/mirrors-mypy
   rev: v1.15.0
   hooks:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,6 +67,7 @@
     "jest-transform-stub": "^2.0.0",
     "nyc": "^17.1.0",
     "prettier": "^3.5.3",
+    "ts-jest": "^29.2.4",
     "typescript": "^5"
   },
   "lint-staged": {
diff --git a/src/ui/app/layout.tsx b/src/ui/app/layout.tsx
@@ -23,7 +23,11 @@ export const viewport: Viewport = {
   width: 'device-width',
 };
 
-export default function RootLayout({ children }: { children: React.ReactNode }) {
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
   return (
     <html lang="en">
       <body>{children}</body>
diff --git a/src/ui/types/jest-dom.d.ts b/src/ui/types/jest-dom.d.ts
@@ -0,0 +1 @@
+import '@testing-library/jest-dom';
