Merge branch 'main' into delete-mui

Author: KaichiManabe

.cspell.json

@@ -19,7 +19,8 @@
     "reqwest",
     "safify",
     "supabase",
-    "swiper"
+    "swiper",
+    "lefthook"
   ],
   "dictionaries": [
     "softwareTerms",

.github/workflows/ci.yml

@@ -67,7 +67,7 @@ jobs:
           bun-version: latest
 
       - run: make setup-ci
-      - run: make spell-check
+      - run: bunx cspell --quiet .
 
   test:
     name: Bun Test

.gitignore

@@ -25,3 +25,4 @@ dist-ssr
 
 .env
 /.direnv
+.husky

.husky/pre-commit

@@ -5,7 +5,6 @@ LOCAL_DB := postgres://user:password@localhost:5432/database
 setup: 
 	if [ ! `command -v bun` ]; then echo 'ERR: Bun is required!'; exit 1; fi
 	make sync
-	bunx husky
 	@echo "auto setup is done. now do:"
 	@echo "- edit server/.env.dev"
 	@echo "- edit web/.env"
@@ -17,6 +16,7 @@ setup-ci:
 	make generate-sql
 
 sync: sync-server sync-web sync-root copy-common 
+	lefthook install || true
 	@echo '----------------------------------------------------------------------------------------------------------'
 	@echo '| Most work is done. now running prisma-generate-sql (which might fail if .env.dev is not set configured)|'
 	@echo '----------------------------------------------------------------------------------------------------------'
@@ -80,16 +80,6 @@ dev-db:
 	@make seed;
 	@echo "Seeding completed."
 
-
-precommit: check-branch lint-staged spell-check
-
-lint-staged:
-	bunx lint-staged
-check-branch:
-	@ if [ "$(git branch --show-current)" == "main" ]; then echo "Cannot make commit on main! aborting..."; exit 1; fi
-spell-check:
-	bunx cspell --quiet .
-
 # Sync (install/update packages, generate prisma, etc)
 
 sync-web:

Makefile

@@ -13,7 +13,6 @@ GNU Make が導入されています。以下は、ユーザーが使うこと
 - make setup (セットアップします。)
 - make start (build -> serve します。)
 - make watch (ホットリロードします。)
-- make precommit (type-check, format-check, lint を実行します。husky で自動実行されます。)
 
 ### 環境構築
 
@@ -27,6 +26,7 @@ GNU Make が導入されています。以下は、ユーザーが使うこと
   - Bun (js)
   - GNU Make
   - nvm (optional)
+  - lefthook
 
 - `make setup` を実行します。
 

README.md

@@ -27,11 +27,13 @@
             biome
             pkg-config
             openssl
+            lefthook
           ] ++ [
             rust-pkgs
           ];
           shellHook = ''
             export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.stdenv.cc.cc.lib}/lib
+            lefthook install
           '' + prisma.shellHook;
         };
       });

bun.lockb

@@ -0,0 +1,16 @@
+# Lefthook: Precommit Hook
+# docs: https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md
+# 必須: Lefthook
+# 必須: `lefthook install`
+pre-commit:
+  parallel: true
+  commands:
+    biome:
+      glob: "*"
+      run: biome check --write --no-errors-on-unmatched --files-ignore-unknown=true -- {staged_files}
+      stage_fixed: true
+    prevent-commit-on-main:
+      run: if [ "$(git branch --show-current)" == "main" ]; then echo "Cannot make commit on main! aborting..."; exit 1; fi
+    cspell:
+      glob: "*"
+      run: bunx cspell --quiet -- {staged_files}

flake.nix

@@ -4,25 +4,19 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepare": "husky"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
     "@biomejs/biome": "^1.9.1",
-    "husky": "^9.1.4",
-    "lint-staged": "^15.2.10",
     "typescript": "^5.6.2"
   },
   "dependencies": {
     "@types/bun": "^1.1.10",
     "cspell": "^8.14.4",
     "zod": "^3.23.8"
   },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx,json}": ["biome check --write"]
-  },
   "trustedDependencies": ["@biomejs/biome"]
 }