Skip to content

chore: update Astro templates to latest versions and prepare for v6#897

Merged
deloreyj merged 5 commits intocloudflare:mainfrom
zeke:z/update-astro-templates
Jan 15, 2026
Merged

chore: update Astro templates to latest versions and prepare for v6#897
deloreyj merged 5 commits intocloudflare:mainfrom
zeke:z/update-astro-templates

Conversation

@zeke
Copy link
Contributor

@zeke zeke commented Jan 13, 2026

This PR updates the Astro templates to the latest stable versions and prepares them for Astro 6 compatibility.

Astro 6 is currently in beta (released today, Jan 13, 2026). These changes ensure the templates:

  • Use the latest stable Astro 5.x versions
  • Are forward-compatible with Astro 6 when it releases
  • Document Node.js 22 requirement (Astro 6 drops Node 18/20 support)

References

Testing locally

gh pr checkout 897 --repo cloudflare/templates

# Test astro-blog-starter-template
cd astro-blog-starter-template
npm install
npm run build

# Test saas-admin-template
cd ../saas-admin-template
npm install
npm run build

zeke added 4 commits January 13, 2026 09:19
…sions

- astro: 5.16.2 -> 5.16.9
- @astrojs/mdx: 4.3.12 -> 4.3.13
- @astrojs/sitemap: 3.6.0 -> 3.6.1
- Add engines.node >= 22 for Astro 6 compatibility
…lity

Import z from 'astro/zod' instead of 'astro:content'.
The z export from astro:content is deprecated in Astro 6.

See: https://v6.docs.astro.build/en/guides/upgrade-to/v6/#deprecated-astroschema-and-z-from-astrocontent
- astro: 5.16.2 -> 5.16.9
- Add engines.node >= 22 for Astro 6 compatibility
- Add TODO comment about @astrojs/tailwind deprecation for Tailwind v4
Copy link

@craigsdennis craigsdennis left a comment

Choose a reason for hiding this comment

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

👍 Like the warnings

@deloreyj
Copy link
Contributor

@zeke Looks like the lockfiles are out of date now. Can you run a pnpm install and pnpm fix:lockfiles from the top level of the repo please?

@zeke
Copy link
Contributor Author

zeke commented Jan 15, 2026

@zeke Looks like the lockfiles are out of date now. Can you run a pnpm install and pnpm fix:lockfiles from the top level of the repo please?

Done! 6beb069 -- that changed a bunch of lock files, not just the top-level stuff. Is that expected?

@deloreyj
Copy link
Contributor

@zeke Looks like the lockfiles are out of date now. Can you run a pnpm install and pnpm fix:lockfiles from the top level of the repo please?

Done! 6beb069 -- that changed a bunch of lock files, not just the top-level stuff. Is that expected?

Yeah, it changed the lockfiles for each of the templates you changed, the top-level lockfile for the monorepo, and the templates.json file that contains a hash of the package.json to ensure that lockfiles and package.json files stay in sync.

@github-actions
Copy link
Contributor

template name version latestVersion isDevDependency
saas-admin-template @types/react 19.2.7 19.2.8 false
saas-admin-template lucide-react 0.555.0 0.562.0 false
saas-admin-template react 19.2.1 19.2.3 false
saas-admin-template react-dom 19.2.1 19.2.3 false
saas-admin-template react-hook-form 7.66.1 7.71.1 false
saas-admin-template tailwindcss ^3.4.0 4.1.18 false
saas-admin-template zod 4.1.13 4.3.5 false
saas-admin-template wrangler 4.56.0 4.59.2 true
astro-blog-starter-template wrangler 4.56.0 4.59.2 true

@github-actions
Copy link
Contributor

Preview link not generated: you must be on a branch, not on a fork.
Collaborators may enable previews for this pull request by attaching the allow preview label.
If you are already a collaborator, please create a branch rather than forking.

@deloreyj deloreyj merged commit 6ff259a into cloudflare:main Jan 15, 2026
2 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.

4 participants