withastro · matthewp · Feb 12, 2026 · Feb 11, 2026 · Feb 11, 2026 · Feb 11, 2026
diff --git a/.changeset/static-output-cloudflare.md b/.changeset/static-output-cloudflare.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/cloudflare": patch
+---
+
+Fixes fully static sites to not output server-side worker code. When all routes are prerendered, the `_worker.js` directory is now removed from the build output.
diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
@@ -1,13 +1,12 @@
 import { createReadStream, existsSync, readFileSync } from 'node:fs';
-import { appendFile, stat } from 'node:fs/promises';
+import { appendFile, rm, stat } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import { removeLeadingForwardSlash } from '@astrojs/internal-helpers/path';
 import { createRedirectsFromAstroRoutes, printAsRedirects } from '@astrojs/underscore-redirects';
 import { cloudflare as cfVitePlugin, type PluginConfig } from '@cloudflare/vite-plugin';
 import type {
 	AstroConfig,
 	AstroIntegration,
-	HookParameters,
 	IntegrationResolvedRoute,
 } from 'astro';
 import { astroFrontmatterScanPlugin } from './esbuild-plugin-astro-frontmatter.js';
@@ -79,9 +78,9 @@ export type Options = {
 
 export default function createIntegration(args?: Options): AstroIntegration {
 	let _config: AstroConfig;
-	let finalBuildOutput: HookParameters<'astro:config:done'>['buildOutput'];
 
 	let _routes: IntegrationResolvedRoute[];
+	let _isFullyStatic = false;
 
 	const sessionKVBindingName = args?.sessionKVBindingName ?? DEFAULT_SESSION_KV_BINDING_NAME;
 	const imagesBindingName = args?.imagesBindingName ?? DEFAULT_IMAGES_BINDING_NAME;
@@ -233,10 +232,13 @@ export default function createIntegration(args?: Options): AstroIntegration {
 			},
 			'astro:routes:resolved': ({ routes }) => {
 				_routes = routes;
+				// Check if all non-internal routes are prerendered (fully static site)
+				const nonInternalRoutes = routes.filter((route) => route.origin !== 'internal');
+				_isFullyStatic =
+					nonInternalRoutes.length > 0 && nonInternalRoutes.every((route) => route.isPrerendered);
 			},
-			'astro:config:done': ({ setAdapter, config, buildOutput, injectTypes, logger }) => {
+			'astro:config:done': ({ setAdapter, config, injectTypes, logger }) => {
 				_config = config;
-				finalBuildOutput = buildOutput;
 
 				injectTypes({
 					filename: 'cloudflare.d.ts',
@@ -254,7 +256,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					supportedAstroFeatures: {
 						serverOutput: 'stable',
 						hybridOutput: 'stable',
-						staticOutput: 'unsupported',
+						staticOutput: 'stable',
 						i18nDomains: 'experimental',
 						sharpImageService: {
 							support: 'limited',
@@ -387,7 +389,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						),
 					),
 					dir,
-					buildOutput: finalBuildOutput,
+					buildOutput: _isFullyStatic ? 'static' : 'server',
 					assets,
 				});
 
@@ -402,6 +404,11 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					}
 				}
 
+				// For fully static sites, remove the worker directory as it's not needed
+				if (_isFullyStatic) {
+					await rm(_config.build.server, { recursive: true, force: true });
+				}
+
 				// Delete this variable so the preview server opens the server build.
 				delete process.env.CLOUDFLARE_VITE_BUILD;
 			},

diff --git a/packages/integrations/cloudflare/test/fixtures/static/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/static/astro.config.mjs
@@ -0,0 +1,7 @@
+import cloudflare from '@astrojs/cloudflare';
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+	adapter: cloudflare(),
+	output: 'static',
+});
diff --git a/packages/integrations/cloudflare/test/fixtures/static/package.json b/packages/integrations/cloudflare/test/fixtures/static/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@test/astro-cloudflare-static",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "build": "astro build"
+  },
+  "dependencies": {
+    "@astrojs/cloudflare": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/cloudflare/test/fixtures/static/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/static/src/pages/index.astro
@@ -0,0 +1,9 @@
+<html>
+<head>
+	<title>Static Site</title>
+</head>
+<body>
+	<h1>Static Site</h1>
+	<p>This is a fully static Astro site using the Cloudflare adapter.</p>
+</body>
+</html>
diff --git a/packages/integrations/cloudflare/test/static.test.js b/packages/integrations/cloudflare/test/static.test.js
@@ -0,0 +1,21 @@
+import { describe, it } from 'node:test';
+import { loadFixture } from './_test-utils.js';
+import assert from 'node:assert/strict';
+import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+describe('Static output', () => {
+	let fixture;
+
+	it('should not output a _worker.js directory for fully static sites', async () => {
+		fixture = await loadFixture({
+			root: './fixtures/static',
+		});
+
+		await fixture.build();
+
+		const workerExists = existsSync(fileURLToPath(new URL('_worker.js', fixture.config.outDir)));
+
+		assert.ok(!workerExists, '_worker.js directory should not exist for static sites');
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml