Skip to content

Support Astro 6#1534

Merged
emmatown merged 3 commits into
Thinkmill:mainfrom
arbaev:support-astro-6
May 27, 2026
Merged

Support Astro 6#1534
emmatown merged 3 commits into
Thinkmill:mainfrom
arbaev:support-astro-6

Conversation

@arbaev
Copy link
Copy Markdown
Contributor

@arbaev arbaev commented Apr 21, 2026

Summary

  • Extend @keystatic/astro peerDependencies to 2 || 3 || 4 || 5 || 6 so the
    integration works with Astro 6.1.8 while remaining compatible with 2–5. No
    runtime changes beyond a @ts-ignore tweak in injectRoute (in Astro 6 types
    the valid key is entrypoint; entryPoint stays for Astro 2/3).
  • Update templates/astro and both dev-projects/astro* to Astro 6.1.8 and
    migrate them to the Content Layer API (loader: glob(), render(entry),
    entry.id, config moved to src/content.config.ts).
  • Templates/dev-projects gain @astrojs/node with output: 'server' because
    Astro 6 requires an adapter for routes with prerender: false (the Keystatic
    admin UI and API). Public pages keep static output via
    export const prerender = true.
  • dev-projects/astro-content: migrate from @astrojs/tailwind (no Astro 6
    support) to @tailwindcss/vite@^4 with a CSS-first config in
    src/styles/global.css.
  • Root manypkg.ignoredRules adds EXTERNAL_MISMATCH so the astro-content
    example can run Tailwind 4 while docs and dev-projects/next-blocks-builder
    stay on Tailwind 3.

A changeset bumps @keystatic/astro as a minor release.

Test plan

  • pnpm check:types passes
  • pnpm check:lint and pnpm check:format pass
  • pnpm build:packages produces packages/astro/dist/*
  • pnpm --filter @example/astro build succeeds on Astro 6.1.8 (server +
    Node adapter)
  • pnpm --filter @example/astro-content build succeeds (Tailwind 4
    CSS-first, Content Layer)
  • pnpm --filter @keystatic/templates-astro build succeeds with prerendered
    public pages
  • pnpm --filter @example/astro devGET /keystatic/ returns 200 with
    the admin UI bundle, nested /keystatic/collection/posts returns 200,
    GET /api/keystatic/github/login returns 307 (OAuth redirect)

@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Apr 21, 2026

🦋 Changeset detected

Latest commit: 01ce28e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@keystatic/astro Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@socket-security
Copy link
Copy Markdown

socket-security Bot commented Apr 21, 2026

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Added@​tailwindcss/​typography@​0.5.1910010010095100

View full report

@pepesrz91
Copy link
Copy Markdown

Hey guys! Are you going to be releasing this support soon? hehe

Comment thread .changeset/support-astro-6.md Outdated
@emmatown emmatown merged commit f5ddef2 into Thinkmill:main May 27, 2026
9 checks passed
@github-actions github-actions Bot mentioned this pull request May 27, 2026
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.

3 participants