Migrate to Cloudflare by matthewp · Pull Request #2432 · withastro/astro.build

matthewp · 2026-05-28T18:17:16Z

Migrate astro.build from Netlify to Cloudflare Workers.

DO NOT MERGE: There's a few moving parts here to deploy this.

netlify · 2026-05-28T18:17:22Z

✅ Deploy Preview for astro-www-2 ready!

Name	Link
🔨 Latest commit	`d13a2bd`
🔍 Latest deploy log	https://app.netlify.com/projects/astro-www-2/deploys/6a2c05af2922d40008fdafe4
😎 Deploy Preview	https://deploy-preview-2432--astro-www-2.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
🤖 Make changes	Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

…build

cloudflare-workers-and-pages · 2026-05-28T18:59:24Z

🚀 Deploying Preview to Cloudflare 🚀

Preview URL: https://cloudflare-migration.previews.astro.build (commit `d13a2bd`)

This URL reflects your latest Preview deployment

Preview Deployments by commit

Status	Deployment URL	Commit	Updated (UTC)	See this deployment's details
Build: Success ✅ Deployment: Success ✅ View logs ↗	https://a3c553a2.previews.astro.build	`d13a2bd`	2026-06-12T13:14:54.613Z	Visit the dashboard ↗
Build: Success ✅ Deployment: Success ✅ View logs ↗	https://382d6697.previews.astro.build	`be90647`	2026-06-11T21:04:59.546Z	Visit the dashboard ↗
Build: Failed ❌ View logs ↗		`59536a1`	2026-06-11T20:58:41.488Z	View logs ↗
Build: Failed ❌ View logs ↗		`53fd01d`	2026-06-11T20:54:34.366Z	View logs ↗
Build: Failed ❌ View logs ↗		`cbcea5f`	2026-06-11T20:49:13.899Z	View logs ↗
Build: In progress 🔵 View logs ↗		`8ee6041`	2026-06-11T20:47:46.243Z	View logs ↗
Build: Success ✅ Deployment: Success ✅ View logs ↗	https://4f7b877c.previews.astro.build	`1089ce1`	2026-06-11T20:45:05.994Z	Visit the dashboard ↗
Build: In progress 🔵 View logs ↗		`0529168`	2026-06-11T20:34:55.419Z	View logs ↗
Build: Success ✅ Deployment: Success ✅ View logs ↗	https://4344687d.previews.astro.build	`4aafcb8`	2026-06-10T12:56:58.086Z	Visit the dashboard ↗
Build: Success ✅ Deployment: Success ✅ View logs ↗	https://e2f723be.previews.astro.build	`f0edf23`	2026-06-10T12:52:39.027Z	Visit the dashboard ↗

View all previews: View all previews ↗

cloudflare-workers-and-pages · 2026-05-28T19:12:13Z

Deploying with Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status	Name	Latest Commit	Updated (UTC)
✅ Deployment successful! View logs	astro-build	`d13a2bd`	Jun 12 2026, 01:14 PM

…ob loader at runtime

…he rest

…es, remove debug logging

matthewp · 2026-05-29T18:33:15Z


 <video autoplay controls loop muted playsinline>
-	<source src="/assets/blog/launch-video.mp4" type="video/mp4" />
+	<source src="https://site-assets.astro.build/blog/launch-video.mp4" type="video/mp4" />


This video exceeds the size allowed in Workers, so I pushed it to an R2 bucket and make this domain an alias to it.

matthewp · 2026-05-29T18:33:47Z

-	['utilities', 'Utilities'],
-	['uncategorized', 'Uncategorized'],
-] as const);
+import { IntegrationCategories } from './data/integration-categories.js';


This prevents the content config from being imported into prod (where it breaks in workerd).

…erendered

matthewp · 2026-06-08T20:16:55Z

251286d#diff-841254fe75488c1bd4cd7f68f00b4be0e48dcfbc4a16b45847b68295e0e3b27bR8-R15

Moved the font proxying to inside of the worker. I see similar load times for the fonts.

delucis · 2026-06-10T10:02:46Z

-export const prerender = false;
+export const prerender = true;

 if (Astro.url.searchParams.size > 0) {
 	Astro.redirect(`/themes/1/${Astro.url.searchParams.toString()}`, 301);
 }


I’m realising the change to a static page will break the redirect.

Discussing on Discord whether we need to keep it or not: https://discord.com/channels/830184174198718474/1473314557593387100/1514206476212895795

Moved this back to SSR then: 4aafcb8

OK — we can monitor performance. Hopefully it’s fine and Cloudflare will catch up to Netlify’s capabilities soon.

delucis · 2026-06-10T10:06:01Z

+/* On Cloudflare Workers Builds, CF_PAGES_URL is set to the preview URL for non-production deploys */
+const PREVIEW_SITE = process.env.CF_PAGES_URL;


Are you sure this is correct?

In the preview deploy I’m seeing everything using astro.build and not a preview-specific URL, e.g. og:image URLs etc.

Updated to use WORKERS_CI_BRANCH which seems to fix it.

Looks good — we should check after merging to make sure this is also the value we want in prod (i.e. it should be https://cloudflare-migration.previews.astro.build/ or whatever for previews, but https://astro.build/ for prod).

Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>

delucis

Looks like our patch which blocks animated images in the image service (patches/astro.patch) is no longer working, compare the first image on

It’s to the sharp image service, maybe Cloudflare uses a different one?

Also spotted something around redirects.

Other than that, there’s a lockfile conflict which will need resolving before merging.

delucis · 2026-06-11T15:32:07Z

Ah, re: the image service, @theotterlord pointed out that it could be because those images are on on-demand pages and so there’s no optimisation enabled at all by default on CF? On Netlify we do optimise on-demand images.

# Conflicts: # pnpm-lock.yaml

matthewp · 2026-06-11T20:51:26Z

Ok, resolved most everything here:

Redirects to non-trailing slash weren't working because in Cloudflare the file expects exact matches. Fixed by adding duplicates.
Switched to cloudflare-binding to get on-demand optimizations as well. This doesn't fix the animation issue. I think it's supported by the image binding in Cloudflare, but I'll need to add an option to the adapter to allow that to be configured. Will have that in a future PR.

Removed the patch as well. We really shouldn't be patching Astro internals as workarounds. If Astro lacks a needed feature we should add it, and feel the pain like all of our users until it is.

Ready for another review.

matthewp · 2026-06-11T20:51:47Z

Or wait, maybe not, build issue it seems.

matthewp · 2026-06-11T21:06:40Z

Ok, ready now.

delucis

Looking good mostly!

Agree re: patching — it’s just an unusual need (“disallow animated images”) so it was hard to prioritise in Astro itself and this was a quick hack for what is fundamentally an issue in the theme portal (which we intentionally have not been investing time in). So yeah, limited resources => suboptimal solutions. But an image component option that disables animation could be handy for sure (<Image {src} alt="" noAnimation /> or whatever) — not sure if it would be supported in all target image services though.

…timizeDeps

delucis

Congrats @matthewp I believe you have slain the final boss!

Cloudflare sure doesn’t make things easy 😅

Left two final notes for us to bear in mind post-merge.

I’d also love to figure out the PR comments situation as the stuff CF posts is not amazing, but we can see what it looks like in real-world PRs first.

delucis · 2026-06-12T15:39:16Z

+/* On Cloudflare Workers Builds, WORKERS_CI_BRANCH is set to the branch name for non-production deploys */
+const PREVIEW_SITE = process.env.WORKERS_CI_BRANCH
+	? `https://${process.env.WORKERS_CI_BRANCH}.previews.astro.build`
+	: undefined;


Reminder for us to double check this once the PR merges.

delucis · 2026-06-12T15:42:13Z

 	},
-	adapter: netlify({ imageCDN: false }),
+	adapter: cloudflare({
+		imageService: 'cloudflare-binding',


Noting that images feel noticeably slower in the preview deploy. I think this is because Netlify had a kind of hybrid set-up:

images on static pages are optimized at build time and served from the CDN

images on dynamic pages are optimized on demand

But with cloudflare-binding all images are served on-demand.

Not a blocker necessarily, but worth looking into improving. I know @OliverSpeir had one suggestion in withastro/astro#15662 and there’s also withastro/astro#16194 which is related.

matthewp · 2026-06-12T17:06:19Z

Merging, will check all of these things after DNS is updated.

This reverts commit 4dd0255.

matthewp added 2 commits May 26, 2026 08:46

Checkpoint

a6ff1e2

Merge main into cloudflare-migration

e2f7d7a

matthewp added 3 commits May 28, 2026 14:33

Remove Netlify config, use R2 for large assets via site-assets.astro.…

fdec2d3

…build

Add advanced routing to proxy /fonts/* to fonts-cdn.astro.build

6dcfcab

Trigger Workers Build

dd77cab

Trigger Workers Build (2)

850ca09

Move IntegrationCategories out of content.config to avoid bundling gl…

080e4e6

…ob loader at runtime

florian-lefebvre reviewed May 28, 2026

View reviewed changes

Comment thread src/app.ts Outdated

matthewp added 13 commits May 28, 2026 15:51

Add request logging to app.ts

df8cac3

Add verbose request and fetch logging

43c3721

Log response body on non-ok fetch responses

d91ca95

Trigger rebuild

8d71e9e

Fix: change not_found_handling to none so SSR routes reach the worker

4d2e761

Strip wrangler.jsonc down to custom config only, let adapter handle t…

1865960

…he rest

Add extensive logging to app.ts

02eccd8

Fix: remove env param from fetch signature

604a55e

Enable node compat flag

514ade4

Pre-bundle @iconify/utils for workerd compatibility

31dae02

Use prerenderEnvironment: 'node' to avoid CJS/workerd incompatibiliti…

d969527

…es, remove debug logging

Remove app.ts and advancedRouting, no longer needed

2e54f5f

Pre-bundle CJS deps for workerd compatibility (expressive-code, iconify)

178477d

matthewp commented May 29, 2026

View reviewed changes

Trigger rebuild

947d158

matthewp mentioned this pull request May 29, 2026

ci: update showcase #2437

Merged

Revert to prerenderEnvironment: node

937517d

matthewp commented May 29, 2026

View reviewed changes

Comment thread public/_redirects

matthewp added 2 commits June 8, 2026 14:00

Revert dynamic routes back to SSR, keep only themes/agencies index pr…

e26bd79

…erendered

Merge main into cloudflare-migration

f8a8558

matthewp added 2 commits June 9, 2026 08:22

Use fonts-cdn.astro.build directly with preconnect, remove app.ts proxy

23d26b1

Merge main into cloudflare-migration

7f11920

delucis reviewed Jun 10, 2026

View reviewed changes

matthewp and others added 3 commits June 10, 2026 08:42

Update src/pages/agencies/index.astro

35c8d3d

Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>

Fix preview site URL to use WORKERS_CI_BRANCH env var

f0edf23

Revert themes index to SSR for redirect support

4aafcb8

delucis requested changes Jun 11, 2026

View reviewed changes

Comment thread public/_redirects

matthewp added 4 commits June 11, 2026 16:34

Optimize astro-expressive-code

0529168

Add non-trailing-slash variants for all redirects

1089ce1

Merge remote-tracking branch 'origin/main' into cloudflare-migration

8ee6041

# Conflicts: # pnpm-lock.yaml

Remove sharp image service patch

cbcea5f

matthewp added 3 commits June 11, 2026 16:53

Remove astro patch from lockfile

53fd01d

Remove astro patch from pnpm

59536a1

Remove astro patch from pnpm-workspace.yaml

be90647

delucis requested changes Jun 12, 2026

View reviewed changes

Comment thread astro.config.mjs

Fix expressive code: use JS regex engine and add postcss-nested to op…

d13a2bd

…timizeDeps

delucis approved these changes Jun 12, 2026

View reviewed changes

matthewp merged commit 4012c2e into main Jun 12, 2026
8 checks passed

matthewp deleted the cloudflare-migration branch June 12, 2026 17:06

matthewp mentioned this pull request Jun 12, 2026

fix: exclude main branch from preview site URL #2466

Merged

matthewp added a commit that referenced this pull request Jul 13, 2026

Reapply "Migrate to Cloudflare (#2432)"

1f897b9

This reverts commit 4dd0255.

matthewp added a commit that referenced this pull request Jul 13, 2026

Reapply "Migrate to Cloudflare (#2432)"

b1fa143

This reverts commit 4dd0255.

		/* On Cloudflare Workers Builds, CF_PAGES_URL is set to the preview URL for non-production deploys */
		const PREVIEW_SITE = process.env.CF_PAGES_URL;

Uh oh!

Conversation

matthewp commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for astro-www-2 ready!

Uh oh!

cloudflare-workers-and-pages Bot commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 Deploying Preview to Cloudflare 🚀

Preview URL: https://cloudflare-migration.previews.astro.build (commit d13a2bd)

This URL reflects your latest Preview deployment

Preview Deployments by commit

View all previews: View all previews ↗

Uh oh!

cloudflare-workers-and-pages Bot commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying with Cloudflare Workers

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

matthewp commented Jun 8, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

delucis left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

delucis commented Jun 11, 2026

Uh oh!

matthewp commented Jun 11, 2026

Uh oh!

matthewp commented Jun 11, 2026

Uh oh!

matthewp commented Jun 11, 2026

Uh oh!

delucis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

delucis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matthewp commented Jun 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

matthewp commented May 28, 2026 •

edited

Loading

netlify Bot commented May 28, 2026 •

edited

Loading

cloudflare-workers-and-pages Bot commented May 28, 2026 •

edited

Loading

Preview URL: https://cloudflare-migration.previews.astro.build (commit `d13a2bd`)

cloudflare-workers-and-pages Bot commented May 28, 2026 •

edited

Loading

delucis left a comment •

edited

Loading

delucis left a comment •

edited

Loading