feat: use bun and lefthook

2024-12-23 03:45:26 +08:00 · 2024-12-23 03:45:26 +08:00 · 22a958c673
commit 22a958c673
parent a02589936c
8 changed files with 132 additions and 8078 deletions
--- a/.husky/_/pre-commit
+++ b/.husky/_/pre-commit
@ -0,0 +1,57 @@
+#!/bin/sh
+
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
+fi
+
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
+fi
+
+call_lefthook()
+{
+  if test -n "$LEFTHOOK_BIN"
+  then
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
+  then
+    lefthook "$@"
+  else
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+    
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
+  fi
+}
+
+call_lefthook run "pre-commit" "$@"
--- a/.husky/_/prepare-commit-msg
+++ b/.husky/_/prepare-commit-msg
@ -0,0 +1,57 @@
+#!/bin/sh
+
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
+fi
+
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
+fi
+
+call_lefthook()
+{
+  if test -n "$LEFTHOOK_BIN"
+  then
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
+  then
+    lefthook "$@"
+  else
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+    
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
+  fi
+}
+
+call_lefthook run "prepare-commit-msg" "$@"
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@ -1 +0,0 @@
-pnpm lint-staged
--- a/README.md
+++ b/README.md
@ -6,10 +6,8 @@ A minimalism, personal blog theme for Astro.

 [![Built with Astro](https://astro.badg.es/v1/built-with-astro/tiny.svg)](https://astro.build) [![Netlify Status](https://api.netlify.com/api/v1/badges/a4eb6e88-606d-4ea6-9a53-179e03a7e2ef/deploy-status)](https://app.netlify.com/sites/astro-air/deploys)

-
 <img style="border-radius: 10px;" src="https://cdn.jsdelivr.net/gh/sun0225SUN/astro-air/public/preview.png" alt="Astro Air">

-
 ## Showcase

 - [Astro Air](https://astro-air.guoqi.dev)
@ -36,10 +34,9 @@ A minimalism, personal blog theme for Astro.

 ## Quick Start

-   [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/sun0225SUN/astro-air)
-
-   [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/sun0225SUN/astro-air)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/sun0225SUN/astro-air)

+[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/sun0225SUN/astro-air)

 ## Configuration

--- a/bun.lockb
+++ b/bun.lockb
--- a/lefthook.yml
+++ b/lefthook.yml
@ -0,0 +1,14 @@
+pre-commit:
+  commands:
+    prettier-js:
+      glob: "*.{js,jsx,ts,tsx,astro}"
+      run: prettier --write {staged_files}
+    eslint-fix:
+      glob: "*.{js,jsx,ts,tsx,astro}"
+      run: eslint --fix {staged_files}
+    eslint:
+      glob: "*.{js,jsx,ts,tsx,astro}"
+      run: eslint {staged_files}
+    prettier-other:
+      glob: "*.{json,css,md}"
+      run: prettier --write {staged_files}
--- a/package.json
+++ b/package.json
@ -7,8 +7,7 @@
    "build": "astro check && astro build",
    "preview": "astro preview",
    "astro": "astro",
-    "format": "prettier --write .",
-    "prepare": "husky"
+    "format": "prettier --write ."
  },
  "dependencies": {
    "@astrojs/check": "^0.9.4",
@ -23,10 +22,10 @@
    "astro-google-analytics": "^1.0.3",
    "astro-og-canvas": "^0.5.5",
    "canvaskit-wasm": "^0.39.1",
+    "lefthook": "^1.10.0",
    "lucide-react": "^0.468.0",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
-    "sanitize-html": "^2.13.1",
    "tailwindcss": "^3.4.16",
    "twikoo": "^1.6.40",
    "typescript": "^5.7.2"
@ -40,21 +39,9 @@
    "eslint": "^9.17.0",
    "eslint-plugin-astro": "^1.3.1",
    "eslint-plugin-jsx-a11y": "^6.10.2",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.2.11",
    "prettier": "^3.4.2",
    "prettier-plugin-astro": "^0.14.1",
    "prettier-plugin-tailwindcss": "^0.6.9",
    "sass": "^1.83.0"
-  },
-  "lint-staged": {
-    "*/**/*.{js,jsx,ts,tsx,astro}": [
-      "prettier --write",
-      "eslint --fix",
-      "eslint"
-    ],
-    "*/**/*.{json,css,md}": [
-      "prettier --write"
-    ]
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml