Merge branch 'main' into wtang/pbtc

block · Feb 20, 2025 · b9929d1 · b9929d1
2 parents 13a1e91 + 3af2bf8
commit b9929d1
Show file tree

Hide file tree

Showing 108 changed files with 15,180 additions and 1,810 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,10 +10,6 @@ tmp/
 debug/
 target/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,7 @@
 #!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
 
-cd ui/desktop && npx lint-staged
+# Only auto-format desktop TS code if relevant files are modified
+if git diff --cached --name-only | grep -q "^ui/desktop/"; then
+  . "$(dirname -- "$0")/_/husky.sh"
+  cd ui/desktop && npx lint-staged
+fi