Skip to content

fix(deps): bump astro to 7.1.3 + re-resolve brace-expansion to clear osv-scanner (#636)#637

Merged
isadeks merged 1 commit into
mainfrom
fix/636-osv-deps-bump
Jul 21, 2026
Merged

fix(deps): bump astro to 7.1.3 + re-resolve brace-expansion to clear osv-scanner (#636)#637
isadeks merged 1 commit into
mainfrom
fix/636-osv-deps-bump

Conversation

@scottschreckengaust

Copy link
Copy Markdown
Contributor

What & why

The osv-scanner required check (Secrets, deps, and workflow scanDependency scan (osv-scanner))
fails on main's yarn.lock, which ejects every PR from the merge queue — the merge_group
re-scan runs against the latest main and fails any queued PR. Observed on #623, which is otherwise
approved + CLEAN but kept getting removed from the queue by github-merge-queue[bot].

These advisories were published after the affected PRs' PR-open scans, so PR-level checks are
green while the merge_group re-scan is red.

Closes #636.

Changes (lockfile-only + one version string)

  • astro 7.0.57.1.3 (docs/package.json). Fixes GHSA-4g3v-8h47-v7g6 (reflected XSS),
    GHSA-8mv7-9c27-98vc, GHSA-f48w-9m4c-m7f5.
  • brace-expansion re-resolved within the existing ^1.1.7 / ^2.0.2 ranges:
    1.1.15 → 1.1.16 and 2.1.1 → 2.1.2 (GHSA-3jxr-9vmj-r5cp, CVSS 7.7). Transitive-only, so no
    resolutions pin was needed — the caret ranges already permit the patched versions.

Verification

  • mise run security:deps (osv-scanner, exact CI command) → No issues found (exit 0).
  • mise //docs:build → 68 pages built clean under astro 7.1.3.
  • mise run security:retire → clean.
  • Range-scoped gitleaks (origin/main..HEAD) → no leaks (the pre-push full-history hit is
    pre-existing history on other branches, unrelated to this diff).

Supersedes

Dependabot #631 and #630 (both bump astro to the malicious 7.1.0) — close as superseded
once this lands.

…osv-scanner (#636)

The osv-scanner required check (`Secrets, deps, and workflow scan`) fails on main's
yarn.lock, ejecting every PR from the merge queue (observed on #623). Advisories were
published after PR-open scans, so PR-level checks are green while the merge_group
re-scan is red.

- astro 7.0.5 -> 7.1.3 (docs/package.json). Fixes GHSA-4g3v-8h47-v7g6 (XSS),
  GHSA-8mv7-9c27-98vc, GHSA-f48w-9m4c-m7f5. NOTE: intentionally 7.1.3, NOT 7.1.0 —
  7.1.0 (the version Dependabot #631/#630 target, and the "fixed" version GHSA-4g3v
  cites) is flagged malicious by MAL-2026-10726. 7.1.3 is the current `latest` and is
  past the single poisoned release.
- brace-expansion re-resolved within existing ^1.1.7/^2.0.2 ranges: 1.1.15 -> 1.1.16
  and 2.1.1 -> 2.1.2 (GHSA-3jxr-9vmj-r5cp). Transitive-only; no resolutions pin needed.

Lockfile-only (+ one version string). Verified: `mise run security:deps` exits 0,
`mise //docs:build` builds 68 pages clean, `mise run security:retire` clean.
Supersedes Dependabot #631/#630 (which bump to the malicious 7.1.0).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@scottschreckengaust
scottschreckengaust requested review from a team as code owners July 21, 2026 16:29

@isadeks isadeks left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving — verified independently.

Correct fix, correctly scoped. Diff is lockfile-only + one version string (docs/package.json + yarn.lock), no code touched:

  • astro 7.0.5 → 7.1.3 — clears the three XSS advisories (GHSA-4g3v-8h47-v7g6 / -8mv7-9c27-98vc / -f48w-9m4c-m7f5), and deliberately 7.1.3, not the 7.1.0 Dependabot #631/#630 targeted7.1.0 is flagged malicious by MAL-2026-10726 (confirmed: 7.1.0 returns that advisory in OSV, 7.1.3 is clean).
  • brace-expansion 1.1.15 → 1.1.16 + 2.1.1 → 2.1.2 (GHSA-3jxr-9vmj-r5cp) — re-resolved within the existing caret ranges, no resolutions pin needed. Both patched versions confirmed clean in OSV.

All 8 checks green, incl. the previously-failing Secrets, deps, and workflow scan — osv-scanner logs "No issues found" (exit 0). This clears the merge_group re-scan that was ejecting approved PRs from the queue, and the same red check on #616 and other open PRs.

Superseding #631/#630 is the right call — both bump into the poisoned 7.1.0.

@isadeks
isadeks added this pull request to the merge queue Jul 21, 2026
Merged via the queue into main with commit 5ec6e14 Jul 21, 2026
8 checks passed
@isadeks
isadeks deleted the fix/636-osv-deps-bump branch July 21, 2026 16:43
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.

fix(deps): bump astro (7.1.0) + brace-expansion to clear osv-scanner failures blocking the merge queue

2 participants