Skip to content

fix(deps): Astro 7 upgrade (conflict-resolved) - #228

Merged
AustinAbbott merged 3 commits into
masterfrom
cursor/astro-7-conflict-resolve-8e38
Sep 6, 2026
Merged

fix(deps): Astro 7 upgrade (conflict-resolved)#228
AustinAbbott merged 3 commits into
masterfrom
cursor/astro-7-conflict-resolve-8e38

Conversation

@AustinAbbott

Copy link
Copy Markdown
Owner

Resolves merge conflicts from Renovate PR #198 by merging master and regenerating package-lock.json.

Changes

  • Astro ^7.0.0 / @astrojs/mdx ^7.0.0 (from Renovate)
  • Merged latest master (Node/Playwright/lockfile updates)
  • Regenerated lockfile for a clean install on Astro 7.3.1
  • Content schemas import z from astro/zod
  • AGENTS.md refreshed for Astro 7 + visual tests

Verification

  • npm run build (astro check + build) ✅
  • npm run test:visual — 8/8 snapshots ✅

Notes

Could not push directly to renovate/major-astro-monorepo (branch rules require Visual + Code Scanning on the new SHA before update). This branch is the conflict-free equivalent of #198 and can replace it.

Closes #198 (once merged). Related: #217.

Open in Web Open in Cursor 

renovate Bot and others added 3 commits July 11, 2026 19:53
Resolve package-lock.json conflict by regenerating the lockfile against Astro 7.

Co-authored-by: Austin Abbott <AustinAbbott@users.noreply.github.com>
Import content schemas from astro/zod and refresh AGENTS.md for Astro 7.

Co-authored-by: Austin Abbott <AustinAbbott@users.noreply.github.com>
@cursor cursor Bot mentioned this pull request Sep 6, 2026
1 task
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying dev-blog with  Cloudflare Pages  Cloudflare Pages

Latest commit: 15732ee
Status: ✅  Deploy successful!
Preview URL: https://eb3943fc.dev-blog-10f.pages.dev
Branch Preview URL: https://cursor-astro-7-conflict-reso.dev-blog-10f.pages.dev

View logs

@AustinAbbott
AustinAbbott marked this pull request as ready for review September 6, 2026 21:53
@AustinAbbott
AustinAbbott merged commit f5a1aa3 into master Sep 6, 2026
8 checks passed
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