Skip to content

chore: merge main into dependency-cooldown branch and fix audit vulnerabilities#97

Draft
watany-dev with Copilot wants to merge 2 commits into
mainfrom
copilot/resolve-conflict-and-run-ci
Draft

chore: merge main into dependency-cooldown branch and fix audit vulnerabilities#97
watany-dev with Copilot wants to merge 2 commits into
mainfrom
copilot/resolve-conflict-and-run-ci

Conversation

Copilot AI commented Apr 30, 2026

Copy link
Copy Markdown
Contributor

PR #92 had merge conflicts with main (which had advanced through PRs #93#96) and two new audit vulnerabilities surfaced after the merge.

Conflict resolution

  • bunfig.toml: kept minimumReleaseAgeExcludes from main alongside the existing minimumReleaseAge = 604800
  • package.json / bun.lock: merged vite override from main with smol-toml and picomatch overrides from the PR branch

Audit fixes

Two vulnerabilities exposed after the merge:

"overrides": {
  "fast-xml-parser": ">=5.7.0",
  "rollup": ">=4.59.0",
  "smol-toml": ">=1.6.1",
  "vite": ">=7.3.2 <8.0.0",
  "picomatch": ">=4.0.4",
  "postcss": ">=8.5.10"
}

Copilot AI and others added 2 commits April 30, 2026 07:16
Co-authored-by: watany-dev <76135106+watany-dev@users.noreply.github.com>
Base automatically changed from claude/dependency-breach-cooldown-bagsG to main June 22, 2026 16:15
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.

2 participants