xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions 2 Packages Projects Releases 7 Wiki Activity

ci: Prettier纳入两层防御体系 #520

Merged
auto-approve-bot merged 6 commits from ci/prettier-two-layer-defense into develop 2026-07-18 18:08:20 +08:00
Conversation 6 Commits 6 Files Changed 145
+10310 -12869
xiaoxia commented 2026-07-18 15:54:21 +08:00
Owner
Copy Link
Copy Source

改动内容

将前端 Prettier 纳入两层防御体系，纯 CI 配置改动，不碰业务代码。

第一层：本地 pre-commit

  • .pre-commit-config.yaml 新增 prettier hook
  • 只匹配 apps/web/ 下的前端文件（ts/tsx/js/jsx/css/scss/less/json/html/md/yaml/yml）

第二层：CI 自动修复

  • scripts/ci/auto_fix_formatting.py 增加 Prettier 自动修复
  • 支持增量模式（只格式化变更文件）和全量模式
  • 自动检测并安装前端依赖

编辑器层：VSCode 保存自动格式化

  • .vscode/settings.json 增加 TS/TSX/JS/CSS/JSON/HTML/MD 等保存自动格式化
  • 使用 Prettier 作为默认格式化器

配置文件

  • 新增 apps/web/.prettierrc.json — Prettier 配置
  • 新增 apps/web/.prettierignore — 忽略文件
  • apps/web/package.json 增加 format / format:check 脚本
## 改动内容 将前端 Prettier 纳入两层防御体系，纯 CI 配置改动，不碰业务代码。 ### 第一层：本地 pre-commit - `.pre-commit-config.yaml` 新增 `prettier` hook - 只匹配 `apps/web/` 下的前端文件（ts/tsx/js/jsx/css/scss/less/json/html/md/yaml/yml） ### 第二层：CI 自动修复 - `scripts/ci/auto_fix_formatting.py` 增加 Prettier 自动修复 - 支持增量模式（只格式化变更文件）和全量模式 - 自动检测并安装前端依赖 ### 编辑器层：VSCode 保存自动格式化 - `.vscode/settings.json` 增加 TS/TSX/JS/CSS/JSON/HTML/MD 等保存自动格式化 - 使用 Prettier 作为默认格式化器 ### 配置文件 - 新增 `apps/web/.prettierrc.json` — Prettier 配置 - 新增 `apps/web/.prettierignore` — 忽略文件 - `apps/web/package.json` 增加 `format` / `format:check` 脚本
gitea-actions bot commented 2026-07-18 17:30:06 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #520
预览链接 https://pr-520.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #520 | | 预览链接 | [https://pr-520.preview.xiaoxiajianji.com](https://pr-520.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
auto-approve-bot approved these changes 2026-07-18 17:40:56 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-07-18 17:40:56 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot commented 2026-07-18 17:42:36 +08:00
Collaborator
Copy Link
Copy Source

Auto merge failed after multiple 405 errors: PR may have conflicts or unresolved checks. Please review manually.

Auto merge failed after multiple 405 errors: PR may have conflicts or unresolved checks. Please review manually.
xiaoxia added 5 commits 2026-07-18 17:47:19 +08:00
ci: 纳入 Prettier 到两层防御体系（pre-commit + CI auto-fix + VSCode） 832655c759 
- pre-commit: 新增 prettier hook，覆盖前端文件
- CI auto_fix: 增加 prettier 自动修复（增量/全量模式）
- VSCode: 前端文件保存自动格式化
- 新增 apps/web/.prettierrc.json 配置
- 新增 apps/web/.prettierignore 忽略配置
- package.json 增加 format / format:check 脚本
style: 引入Prettier后首次全量格式化（前端 + Python脚本） 330eb983d8 
- apps/web/: prettier --write . 全量格式化（98个文件）
- scripts/ci/auto_fix_formatting.py: black 格式化
纯格式改动，无业务逻辑变更
ci: 集成 eslint-config-prettier，解决 ESLint 与 Prettier 规则冲突 d268e0e38d
ci: 更新 package-lock.json，添加 eslint-config-prettier 依赖 8450fefa20
style: 修复 editPlans.ts Prettier 格式
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 7s
Details
AI Code Review / AI Code Review (pull_request) Failing after 35s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 38s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Failing after 39s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 1m8s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m46s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m54s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m41s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m22s
Details
b73b2efcef
xiaoxia force-pushed ci/prettier-two-layer-defense from 960b7e0cb2 to b73b2efcef 2026-07-18 17:47:19 +08:00 Compare
xiaoxia force-pushed ci/prettier-two-layer-defense from 766e41739c to 074fa96ced 2026-07-18 17:58:08 +08:00 Compare
xiaoxia added 1 commit 2026-07-18 18:03:42 +08:00
ci: 升级 Prettier 到 3.9.x + 集成 eslint-config-prettier，修复缓存与规则冲突
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 18s
Details
AI Code Review / AI Code Review (pull_request) Successful in 1m43s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m49s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m52s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m43s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m8s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m30s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m23s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 4m38s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 22s
Details
0f81a07174
xiaoxia force-pushed ci/prettier-two-layer-defense from 074fa96ced to 0f81a07174 2026-07-18 18:03:42 +08:00 Compare
auto-approve-bot commented 2026-07-18 18:05:26 +08:00
Collaborator
Copy Link
Copy Source

代码审查结果 - PR #520

⚠️ 问题（0个需要修改）

无

💡 建议（1个可选）

  1. .pre-commit-config.yaml 第23行：建议避免使用 alpha 版本的依赖
    • 问题描述：pre-commit/mirrors-prettier 使用了 v4.0.0-alpha.11。Alpha 版本通常意味着不稳定，可能会在 CI/CD 流程中引入意外的行为或破坏性变更。
    • 修改建议：除非有特定功能必须使用 alpha 版本，否则建议使用最新的稳定版本（如 v3.x 或 v4 的正式版），以保障团队开发环境的一致性和稳定性。

✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能无影响

🤖 由 AI 代码审查机器人自动生成 | 2026-07-18 18:05:26 | 模型:

## 代码审查结果 - PR #520 ### ⚠️ 问题（0个需要修改） 无 ### 💡 建议（1个可选） 1. **.pre-commit-config.yaml 第23行**：建议避免使用 alpha 版本的依赖 - 问题描述：`pre-commit/mirrors-prettier` 使用了 `v4.0.0-alpha.11`。Alpha 版本通常意味着不稳定，可能会在 CI/CD 流程中引入意外的行为或破坏性变更。 - 修改建议：除非有特定功能必须使用 alpha 版本，否则建议使用最新的稳定版本（如 v3.x 或 v4 的正式版），以保障团队开发环境的一致性和稳定性。 --- ✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能无影响 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-07-18 18:05:26 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
auto-approve-bot merged commit 0fcb77b991 into develop 2026-07-18 18:08:20 +08:00
auto-approve-bot deleted branch ci/prettier-two-layer-defense 2026-07-18 18:08:20 +08:00
gitea-actions bot commented 2026-07-18 18:08:42 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #520 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #520 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#520
Delete Branch "ci/prettier-two-layer-defense"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?