Skip to content

fix(deps): 补回丢失的 pnpm overrides 安全修复#136

Merged
m1ngsama merged 1 commit into
mainfrom
fix/security-overrides-redo
Jun 16, 2026
Merged

fix(deps): 补回丢失的 pnpm overrides 安全修复#136
m1ngsama merged 1 commit into
mainfrom
fix/security-overrides-redo

Conversation

@m1ngsama

Copy link
Copy Markdown
Member

背景

PR #135 squash 合并时,pnpm.overrides 块在合并提交阶段被 lint-staged 钩子意外回退,导致真正的安全补丁没有落到 main#135 实际只保留了 Dependabot 已有的 vite ^8.0.16)。本 PR 用普通提交重新补回。

改动

  • mermaid 显式声明 ^11.15.0 + 作用域 override 强制插件 peer 一并升级
  • pnpm.overrides 锁定同 major 传递补丁:lodash 4.18.1 · js-yaml 4.2.0 · markdown-it 14.2.0 · yaml 2.8.3 · picomatch 4.0.4 · ajv 6.14.0 · flatted 3.4.2 · minimatch 3.1.4/9.0.7 · brace-expansion 1.1.13/2.0.3

效果

pnpm audit34 → 7。剩余 7 项为 vitepress 1.6.4 传递的 vite 5.x / esbuild,均 dev-server-only,需 vitepress 2.0(alpha)才能根治。

验证

  • pnpm docs:build 成功
  • pnpm test 26/26

Re-land overrides lost during a prior merge commit. Pin same-major
patched versions for transitive deps and bump mermaid to 11.15.0:
lodash 4.18.1, js-yaml 4.2.0, markdown-it 14.2.0, yaml 2.8.3,
picomatch 4.0.4, ajv 6.14.0, flatted 3.4.2, minimatch 3.1.4/9.0.7,
brace-expansion 1.1.13/2.0.3, mermaid 11.15.0 (incl. plugin peer).

Audit: 34 -> 7 advisories. Remaining 7 (transitive vite 5.x from
vitepress 1.6.4 + its esbuild) are dev-server-only; need vitepress 2.0.
Verified: docs:build OK, vitest 26/26 pass.
@m1ngsama m1ngsama requested a review from Orangedog433 as a code owner June 16, 2026 01:55
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying documents with  Cloudflare Pages  Cloudflare Pages

Latest commit: 07e08ae
Status: ✅  Deploy successful!
Preview URL: https://aaa4d271.documents-dq4.pages.dev
Branch Preview URL: https://fix-security-overrides-redo.documents-dq4.pages.dev

View logs

@m1ngsama m1ngsama merged commit 59bd5c2 into main Jun 16, 2026
5 checks passed
@m1ngsama m1ngsama deleted the fix/security-overrides-redo branch June 16, 2026 01:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant