Support Cloudflare Vite plugin v2 by jamesopstad · Pull Request #18119 · withastro/astro

jamesopstad · 2026-09-24T12:21:37Z

Depends on #18112.

Until that PR lands, the focused diff is:
jamesopstad/astro@resolved-vite-output-dirs...support-cloudflare-vite-plugin-v2

Changes

Updates the adapter to use v2 of @cloudflare/vite-plugin and support deployment with cf.

Projects should replace Wrangler configuration with cloudflare.config.ts, importing configuration utilities from cf/config. cf should also be used in place of Wrangler for deployment.

The adapter’s configPath option has been removed. Configuration is always loaded from a cloudflare.config.ts file in the project root.

wrangler is no longer a peer dependency of @astrojs/cloudflare.

Testing

Tests updated as appropriate.

Docs

This will need a migration guide in the docs.

… paths

changeset-bot · 2026-09-24T12:21:43Z

🦋 Changeset detected

Latest commit: e8b4c3f

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

This PR includes changesets to release 9 packages

Name	Type
astro	Minor
@astrojs/cloudflare	Major
@astrojs/markdoc	Patch
@astrojs/mdx	Patch
@astrojs/netlify	Patch
@astrojs/node	Patch
@astrojs/svelte	Patch
@astrojs/vercel	Patch
@astrojs/vue	Patch

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

github-actions

This PR is blocked because it contains a minor changeset. A reviewer will merge this at the next release if approved.

…eded

ematipico · 2026-09-24T13:59:12Z

+'astro': patch
+---
+
+Defers Vite manifest cleanup until all `buildApp` hooks have completed, allowing platform plugins to consume the manifests.


Unless this change fixes some user-facing problem, we don't need it. If so, it should be reworded. Here's a small guide https://contribute.docs.astro.build/docs-for-code-changes/changesets/#patch-updates

ematipico · 2026-09-24T14:00:07Z

Here's a guide to write breaking changes https://contribute.docs.astro.build/docs-for-code-changes/changesets/#breaking-changes

ematipico · 2026-09-24T14:00:43Z

+---
+'astro': minor
+---
+
+Astro now treats Vite's resolved `outDir` values as the source of truth for build output. Generated assets, build hook `dir` values, and SSR manifest paths use the resolved client, server, and prerender directories. Custom prerenderer factories also receive these directories through a new context argument.


I would rewrite this changeset from the user point of view.

ematipico · 2026-09-24T14:04:22Z

+	const flags = compatibilityFlags ?? [];
+	if (flags.some((flag) => ALS_CAPABLE_FLAGS.includes(flag))) {
+		return flags;
+	}
+	return [...flags, 'nodejs_als'];


Suggested change

const flags = compatibilityFlags ?? [];

if (flags.some((flag) => ALS_CAPABLE_FLAGS.includes(flag))) {

return flags;

}

return [...flags, 'nodejs_als'];

if (!compatibilityFlags) {

return ['nodejs_als']

}

if (compatibilityFlags.some((flag) => ALS_CAPABLE_FLAGS.includes(flag))) {

return compatibilityFlags;

}

return compatibilityFlags.push('nodejs_als')

Since in the if we return the original array, there's no need for the spread

This code hasn't changed. It's only in the diff because the filename has changed.

ematipico · 2026-09-24T14:08:17Z

-				if (cloudflareOptions.configPath) {
-					addWatchFile(new URL(cloudflareOptions.configPath, config.root));
-				}
-
-				addWatchFile(new URL('./wrangler.toml', config.root));
-				addWatchFile(new URL('./wrangler.json', config.root));
-				addWatchFile(new URL('./wrangler.jsonc', config.root));


Don't we need to watch the new configuration file?

Hmm, that depends on how Astro restarts interact with Vite restarts. We restart the Vite dev server when the config file or any of its dependencies change. Watching it here would be tricky because you don't know its dependencies.

I would check to make sure restarting the dev server in Astro works that same as in vite dev, it might not.

I got an agent to investigate this. Here is its reply:

The Cloudflare plugin already watches cloudflare.config.ts and its dependencies, so watching only the top-level file here would be incomplete and would cause both Astro and Cloudflare to initiate restarts. However, Matthew’s concern uncovered an Astro lifecycle issue: Vite replaces its watcher during a native restart, and Astro’s externally registered restart/content listeners are not reattached after a plugin-initiated restart. We should fix that listener lifecycle and add an astro dev regression test rather than restore addWatchFile() here.

ematipico · 2026-09-24T14:09:07Z

-				// Assign the Wrangler config's effective env (`vars` merged with
-				// `.dev.vars`/`.env` overrides) to process.env so astro:env can find
-				// these variables at build time.
-				loadWranglerEnv(config.root, cloudflareOptions.configPath, logger);


This isn't needed anymore?

Replaced with https://github.com/jamesopstad/astro/blob/30363252f511b806ac539b8d98298df06ee61660/packages/integrations/cloudflare/src/cloudflare-config.ts#L53-L79.

ematipico · 2026-09-24T14:10:36Z

  "peerDependencies": {
-    "astro": "^7.2.0",
-    "wrangler": "^4.125.0"
+    "astro": "^7.4.0"


Was this change intentional? We usually don't bump it unless we need a specific API from astro

This PR relies on #18112, which makes changes to Astro core, so I assumed that would require the bump?

Oh I see. Makes sense then. So I suggest #18112 to main

ematipico · 2026-09-24T14:11:50Z

 }) => {
-	const wranglerConfigPath = resolvePath(fileURLToPath(root), '.wrangler/deploy/config.json');
-	if (!existsSync(wranglerConfigPath)) {
+	const buildOutputConfigPath = new URL('./.cloudflare/output/v0/config.json', root);


Is this v0 something that could change? and if so, is it under semver?

It will change, but only in the beta period. We'll try to keep changes as non-breaking as possible. It will change to v1 after the beta.

ematipico · 2026-09-24T14:12:16Z


-export function pluginPrerender(_opts: StaticBuildOptions, internals: BuildInternals): VitePlugin {
+export function pluginPrerender(
+	_opts: StaticBuildOptionsInput,


Remove it if it's not needed anymore

Sure. I presumed it must be there for a reason.

jamesopstad added 6 commits September 24, 2026 10:25

Use resolved Vite output directories

7a99f9d

Expose resolved output directories to prerenderer factories

6b239e4

Defer Vite manifest cleanup

64395e4

Add changeset

79f0411

Fix virtual manifest so it returns config inputs rather than resolved…

e73118c

… paths

Update the incremental cache test to use client-root-relative paths

579ed25

jamesopstad changed the title ~~Support cloudflare vite plugin v2~~ Support Cloudflare Vite plugin v2 Sep 24, 2026

github-actions Bot added the semver: minor Change triggers a `minor` release label Sep 24, 2026

github-actions Bot requested changes Sep 24, 2026

View reviewed changes

github-actions Bot added pkg: integration Related to any renderer integration (scope) pkg: astro Related to the core `astro` package (scope) docs pr labels Sep 24, 2026

jamesopstad added 3 commits September 24, 2026 14:32

Update Cloudflare adapter to support v2 of the Cloudflare plugin and cf

d6e5668

Remove default compatibility date in customiser as it is no longer ne…

b1743a9

…eded

Add changeset

c6357ef

jamesopstad force-pushed the support-cloudflare-vite-plugin-v2 branch from 3f1e57c to c6357ef Compare September 24, 2026 13:33

Update .gitignore files

3036325

jamesopstad marked this pull request as ready for review September 24, 2026 13:47

ematipico added the pr: astro-review Triggers a bot to do an automated review label Sep 24, 2026

astro-factory Bot removed the pr: astro-review Triggers a bot to do an automated review label Sep 24, 2026

ematipico reviewed Sep 24, 2026

View reviewed changes

Update Cloudflare plugin

e8b4c3f

-	const flags = compatibilityFlags ?? [];
-	if (flags.some((flag) => ALS_CAPABLE_FLAGS.includes(flag))) {
-		return flags;
-	}
-	return [...flags, 'nodejs_als'];
+	if (!compatibilityFlags) {
+		return ['nodejs_als']
+	}
+	if (compatibilityFlags.some((flag) => ALS_CAPABLE_FLAGS.includes(flag))) {
+		return compatibilityFlags;
+	}
+	return compatibilityFlags.push('nodejs_als')

Uh oh!

Conversation

jamesopstad commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Testing

Docs

Uh oh!

changeset-bot Bot commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions Bot left a comment

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!

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!

jamesopstad Sep 24, 2026 • 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!

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!

Choose a reason for hiding this comment

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jamesopstad commented Sep 24, 2026 •

edited

Loading

changeset-bot Bot commented Sep 24, 2026 •

edited

Loading

jamesopstad Sep 24, 2026 •

edited

Loading