From 5ea477eca81941b3a39e9be2c5f1d9cceb877cd7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 24 Mar 2026 12:57:31 +0000
Subject: [PATCH] Consolidate linters

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 apps/desktop/.husky/pre-commit |  4 ----
 apps/desktop/.lintstagedrc     |  2 +-
 apps/desktop/knip.ts           | 17 -----------------
 apps/desktop/package.json      |  9 +--------
 knip.ts                        |  9 +++++++++
 pnpm-lock.yaml                 | 15 ---------------
 6 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100755 apps/desktop/.husky/pre-commit
 delete mode 100644 apps/desktop/knip.ts

diff --git a/apps/desktop/.husky/pre-commit b/apps/desktop/.husky/pre-commit
deleted file mode 100755
index f0e9c9e0cb..0000000000
--- a/apps/desktop/.husky/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged --concurrent false
diff --git a/apps/desktop/.lintstagedrc b/apps/desktop/.lintstagedrc
index c29a05af19..673a390518 100644
--- a/apps/desktop/.lintstagedrc
+++ b/apps/desktop/.lintstagedrc
@@ -1,4 +1,4 @@
 {
-    "*": "prettier --write",
+    "*": "prettier --write --ignore-unknown",
     "*.(ts|tsx)": ["eslint --fix"]
 }
diff --git a/apps/desktop/knip.ts b/apps/desktop/knip.ts
deleted file mode 100644
index 1ef1c51b7a..0000000000
--- a/apps/desktop/knip.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { KnipConfig } from "knip";
-
-export default {
-    entry: ["src/preload.cts", "electron-builder.ts", "scripts/**", "hak/**"],
-    project: ["**/*.{js,ts}"],
-    ignoreDependencies: [
-        // Brought in via hak scripts
-        "matrix-seshat",
-        // Required for `action-validator`
-        "@action-validator/*",
-        // Used for git pre-commit hooks
-        "husky",
-        // Required for `patch-package`
-        "postinstall-postinstall",
-    ],
-    ignoreBinaries: ["jq", "scripts/in-docker.sh"],
-} satisfies KnipConfig;
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index b42768e8c0..b1ee9b4c19 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -29,7 +29,7 @@
         "fetch": "pnpm run mkdirs && tsx scripts/fetch-package.ts",
         "asar-webapp": "asar p webapp webapp.asar",
         "start": "pnpm run build:ts && pnpm run build:res && electron .",
-        "lint": "pnpm lint:types && pnpm lint:js && pnpm lint:workflows",
+        "lint": "pnpm lint:types && pnpm lint:js",
         "lint:js": "eslint --max-warnings 0 src hak playwright scripts && prettier --check .",
         "lint:js-fix": "eslint --fix --max-warnings 0 src hak playwright scripts && prettier --log-level=warn --write .",
         "lint:types": "pnpm lint:types:src && pnpm lint:types:test && pnpm lint:types:scripts && pnpm lint:types:hak",
@@ -37,8 +37,6 @@
         "lint:types:test": "tsc --noEmit -p playwright/tsconfig.json",
         "lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
         "lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
-        "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'",
-        "lint:knip": "knip",
         "build:native": "pnpm run hak",
         "build:native:universal": "pnpm run hak --target x86_64-apple-darwin fetchandbuild && pnpm run hak --target aarch64-apple-darwin fetchandbuild && pnpm run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
         "build:32": "pnpm run build:ts && pnpm run build:res && electron-builder --ia32",
@@ -70,8 +68,6 @@
         "uuid": "^13.0.0"
     },
     "devDependencies": {
-        "@action-validator/cli": "^0.6.0",
-        "@action-validator/core": "^0.6.0",
         "@babel/core": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/preset-typescript": "^7.18.6",
@@ -100,9 +96,6 @@
         "eslint-plugin-n": "^17.12.0",
         "eslint-plugin-unicorn": "^56.0.0",
         "glob": "^13.0.0",
-        "husky": "^9.1.6",
-        "knip": "^5.0.0",
-        "lint-staged": "^16.0.0",
         "matrix-web-i18n": "catalog:",
         "mkdirp": "^3.0.0",
         "pacote": "^21.0.0",
diff --git a/knip.ts b/knip.ts
index 5eb266eb25..a4b6b5530b 100644
--- a/knip.ts
+++ b/knip.ts
@@ -47,6 +47,15 @@ export default {
                 "@types/sdp-transform",
             ],
         },
+        "apps/desktop": {
+            entry: ["src/preload.cts", "electron-builder.ts", "scripts/**", "hak/**"],
+            project: ["**/*.{js,ts}"],
+            ignoreDependencies: [
+                // Brought in via hak scripts
+                "matrix-seshat",
+            ],
+            ignoreBinaries: ["scripts/in-docker.sh"],
+        },
         ".": {
             entry: ["scripts/**", "docs/**"],
         },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cd400e85b8..d773ca8ee6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -178,12 +178,6 @@ importers:
         specifier: ^13.0.0
         version: 13.0.0
     devDependencies:
-      '@action-validator/cli':
-        specifier: ^0.6.0
-        version: 0.6.0(@action-validator/core@0.6.0)
-      '@action-validator/core':
-        specifier: ^0.6.0
-        version: 0.6.0
       '@babel/core':
         specifier: ^7.18.10
         version: 7.29.0
@@ -268,15 +262,6 @@ importers:
       glob:
         specifier: ^13.0.0
         version: 13.0.6
-      husky:
-        specifier: ^9.1.6
-        version: 9.1.7
-      knip:
-        specifier: ^5.0.0
-        version: 5.87.0(patch_hash=873a4dc88d16b775314860cbae8af05be293a2e1a3f86d78562885e78256f2ee)(@types/node@18.19.130)(typescript@5.9.3)
-      lint-staged:
-        specifier: ^16.0.0
-        version: 16.3.0
       matrix-web-i18n:
         specifier: 'catalog:'
         version: 3.6.0