From 7ffaee746901a57dc3d936364bdebec4c500ead4 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Mar 2026 17:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20pubspbec.lock=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=BC=96=E8=AF=91=E7=9A=84=E6=97=B6=E5=80=99=E8=A2=AB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=20bug=EF=BC=8C=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E8=A6=81=E4=BF=9D=E6=8C=81=E9=94=81=E5=AE=9A=EF=BC=8C=E9=99=A4?= =?UTF-8?q?=E9=9D=9E=E4=B8=BB=E5=8A=A8=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build_android.sh | 2 ++ scripts/build_ios.sh | 1 + scripts/build_macos.sh | 1 + scripts/build_windows.sh | 1 + scripts/pre-commit | 60 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 scripts/pre-commit diff --git a/scripts/build_android.sh b/scripts/build_android.sh index 3c01780..cf6274b 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -47,6 +47,7 @@ if [ "$FORMAT" = "aab" ]; then cd "$APP_DIR" flutter build appbundle \ --release \ + --no-pub \ --dart-define-from-file=config/config.json \ --split-debug-info="$DEBUG_INFO_DIR" \ --obfuscate @@ -57,6 +58,7 @@ else cd "$APP_DIR" flutter build apk \ --release \ + --no-pub \ --dart-define-from-file=config/config.json \ --split-debug-info="$DEBUG_INFO_DIR" \ --obfuscate diff --git a/scripts/build_ios.sh b/scripts/build_ios.sh index bcf2b60..b0c5106 100644 --- a/scripts/build_ios.sh +++ b/scripts/build_ios.sh @@ -41,6 +41,7 @@ cd "$APP_DIR" flutter build ipa \ --release \ + --no-pub \ --dart-define-from-file=config/config.json \ --split-debug-info="$DEBUG_INFO_DIR" \ --obfuscate diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh index 4ffef82..26f30b1 100644 --- a/scripts/build_macos.sh +++ b/scripts/build_macos.sh @@ -37,6 +37,7 @@ cd "$APP_DIR" flutter build macos \ --release \ + --no-pub \ --dart-define-from-file=config/config.json \ --split-debug-info="$DEBUG_INFO_DIR" \ --obfuscate diff --git a/scripts/build_windows.sh b/scripts/build_windows.sh index d59d24c..44916ed 100644 --- a/scripts/build_windows.sh +++ b/scripts/build_windows.sh @@ -39,6 +39,7 @@ cd "$APP_DIR" flutter build windows \ --release \ + --no-pub \ --dart-define-from-file=config/config.json \ --split-debug-info="$DEBUG_INFO_DIR" \ --obfuscate diff --git a/scripts/pre-commit b/scripts/pre-commit new file mode 100644 index 0000000..7502da0 --- /dev/null +++ b/scripts/pre-commit @@ -0,0 +1,60 @@ +#!/bin/bash +# Git pre-commit hook:提交前自动 format,analyze 有 error 则拦截提交 +# +# 安装:bash scripts/setup.sh(setup.sh 自动把本文件复制到 .git/hooks/pre-commit) +# 手动安装:cp scripts/pre-commit .git/hooks/pre-commit && chmod +x .git/hooks/pre-commit + +set -euo pipefail + +ROOT_DIR="$(git rev-parse --show-toplevel)" +DART="$(command -v dart 2>/dev/null || echo "")" + +if [[ -z "$DART" ]]; then + echo "[pre-commit] dart not found, skipping checks." + exit 0 +fi + +# ── pubspec.lock 保护 ──────────────────────────────────────────────────────── +# flutter run / flutter build 会在未经授权的情况下触发 pub get 并修改 lock。 +# 规则:lock 有未暂存的改动(意外修改)→ 自动还原; +# 开发者主动 git add pubspec.lock 后(暂存)→ 正常放行。 +LOCK_UNSTAGED=$(git diff --name-only pubspec.lock 2>/dev/null || true) +LOCK_STAGED=$(git diff --cached --name-only pubspec.lock 2>/dev/null || true) + +if [[ -n "$LOCK_UNSTAGED" && -z "$LOCK_STAGED" ]]; then + git checkout HEAD -- pubspec.lock + echo "[pre-commit] pubspec.lock was auto-modified by flutter, restored to HEAD." + echo " To intentionally update: run 'dart pub get' or 'dart pub upgrade'," + echo " then 'git add pubspec.lock' before committing." +fi + +# ── dart format + analyze ──────────────────────────────────────────────────── +STAGED_DART=$(git diff --cached --name-only --diff-filter=ACM | grep '\.dart$' || true) + +if [[ -z "$STAGED_DART" ]]; then + exit 0 +fi + +echo "[pre-commit] formatting staged dart files..." +echo "$STAGED_DART" | xargs dart format --line-length=80 +echo "$STAGED_DART" | xargs git add + +echo "[pre-commit] running dart analyze..." +cd "$ROOT_DIR" + +ANALYZE_OUTPUT=$(dart analyze 2>&1) + +if echo "$ANALYZE_OUTPUT" | grep -q "^ error"; then + echo "[pre-commit] dart analyze found errors, commit blocked." + echo "$ANALYZE_OUTPUT" | grep "^ error" + exit 1 +fi + +if echo "$ANALYZE_OUTPUT" | grep -q "^ warning"; then + echo "[pre-commit] dart analyze found warnings, commit blocked." + echo "$ANALYZE_OUTPUT" | grep "^ warning" + exit 1 +fi + +echo "[pre-commit] all checks passed." +exit 0