Move cloudflare

packages/integrations/cloudflare/.gitignore

@@ -0,0 +1,5 @@
+# Astro cloudflare directory mode creates a function directory
+functions
+.mf
+.wrangler
+.astro

packages/integrations/cloudflare/README.md

@@ -1,3 +1,38 @@
 # @astrojs/cloudflare
 
-The Cloudflare adapter package has moved. Please see [the new repository for the Cloudflare adapter](https://github.com/withastro/adapters/tree/main/packages/cloudflare).
+An SSR adapter for use with Cloudflare Pages Functions targets. Write your code in Astro/Javascript and deploy to Cloudflare Pages.
+
+## Documentation
+
+Read the [`@astrojs/cloudflare` docs][docs]
+
+## Support
+
+- Get help in the [Astro Discord][discord]. Post questions in our `#support` forum, or visit our dedicated `#dev` channel to discuss current development and more!
+
+- Check our [Astro Integration Documentation][astro-integration] for more on integrations.
+
+- Submit bug reports and feature requests as [GitHub issues][issues].
+
+## Contributing
+
+This package is maintained by Astro's Core team. You're welcome to submit an issue or PR! These links will help you get started:
+
+- [Contributor Manual][contributing]
+- [Code of Conduct][coc]
+- [Community Guide][community]
+
+## License
+
+MIT
+
+Copyright (c) 2023–present [Astro][astro]
+
+[astro]: https://astro.build/
+[docs]: https://docs.astro.build/en/guides/integrations-guide/cloudflare/
+[contributing]: https://github.com/withastro/astro/blob/main/CONTRIBUTING.md
+[coc]: https://github.com/withastro/.github/blob/main/CODE_OF_CONDUCT.md
+[community]: https://github.com/withastro/.github/blob/main/COMMUNITY_GUIDE.md
+[discord]: https://astro.build/chat/
+[issues]: https://github.com/withastro/adapter/issues
+[astro-integration]: https://docs.astro.build/en/guides/integrations-guide/

packages/integrations/cloudflare/package.json

@@ -1,8 +1,62 @@
 {
   "name": "@astrojs/cloudflare",
-  "version": "0.0.0",
-  "private": true,
+  "description": "Deploy your site to Cloudflare Workers/Pages",
+  "version": "12.2.1",
   "type": "module",
-  "keywords": [],
-  "dont_remove": "This is a placeholder for the sake of the docs smoke test"
+  "types": "./dist/index.d.ts",
+  "author": "withastro",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/withastro/adapters.git",
+    "directory": "packages/cloudflare"
+  },
+  "keywords": [
+    "withastro",
+    "astro-adapter"
+  ],
+  "bugs": "https://github.com/withastro/adapters/issues",
+  "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/",
+  "exports": {
+    ".": "./dist/index.js",
+    "./entrypoints/server.js": "./dist/entrypoints/server.js",
+    "./entrypoints/middleware.js": "./dist/entrypoints/middleware.js",
+    "./image-service": "./dist/entrypoints/image-service.js",
+    "./image-endpoint": "./dist/entrypoints/image-endpoint.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+    "test": "astro-scripts test \"test/**/*.test.js\""
+  },
+  "dependencies": {
+    "@astrojs/internal-helpers": "0.4.2",
+    "@astrojs/underscore-redirects": "^0.6.0",
+    "@cloudflare/workers-types": "^4.20250109.0",
+    "esbuild": "^0.24.0",
+    "estree-walker": "^3.0.3",
+    "magic-string": "^0.30.17",
+    "miniflare": "^3.20241230.1",
+    "tiny-glob": "^0.2.9",
+    "vite": "^6.0.7",
+    "wrangler": "^3.101.0"
+  },
+  "peerDependencies": {
+    "astro": "^5.0.0"
+  },
+  "devDependencies": {
+    "astro": "workspace:*",
+    "astro-scripts": "workspace:*",
+    "cheerio": "1.0.0",
+    "execa": "^8.0.1",
+    "fast-glob": "^3.3.3",
+    "rollup": "^4.30.1",
+    "strip-ansi": "^7.1.0"
+  },
+  "publishConfig": {
+    "provenance": true
+  }
 }

packages/integrations/cloudflare/src/entrypoints/image-endpoint.ts

@@ -0,0 +1,15 @@
+import type { APIRoute } from 'astro';
+
+export const prerender = false;
+
+export const GET: APIRoute = (ctx) => {
+	const href = ctx.url.searchParams.get('href');
+	if (!href) {
+		return new Response("Missing 'href' query parameter", {
+			status: 400,
+			statusText: "Missing 'href' query parameter",
+		});
+	}
+
+	return fetch(new URL(href, ctx.url.origin));
+};

packages/integrations/cloudflare/src/entrypoints/image-service.ts

@@ -0,0 +1,39 @@
+import type { ExternalImageService } from 'astro';
+
+import { joinPaths } from '@astrojs/internal-helpers/path';
+import { baseService } from 'astro/assets';
+import { isESMImportedImage, isRemoteAllowed } from '../utils/assets.js';
+
+const service: ExternalImageService = {
+	...baseService,
+	getURL: (options, imageConfig) => {
+		const resizingParams = [];
+		if (options.width) resizingParams.push(`width=${options.width}`);
+		if (options.height) resizingParams.push(`height=${options.height}`);
+		if (options.quality) resizingParams.push(`quality=${options.quality}`);
+		if (options.fit) resizingParams.push(`fit=${options.fit}`);
+		if (options.format) resizingParams.push(`format=${options.format}`);
+
+		let imageSource = '';
+		if (isESMImportedImage(options.src)) {
+			imageSource = options.src.src;
+		} else if (isRemoteAllowed(options.src, imageConfig)) {
+			imageSource = options.src;
+		} else {
+			// If it's not an imported image, nor is it allowed using the current domains or remote patterns, we'll just return the original URL
+			return options.src;
+		}
+
+		const imageEndpoint = joinPaths(
+			// @ts-expect-error Can't recognise import.meta.env
+			import.meta.env.BASE_URL,
+			'/cdn-cgi/image',
+			resizingParams.join(','),
+			imageSource,
+		);
+
+		return imageEndpoint;
+	},
+};
+
+export default service;

packages/integrations/cloudflare/src/entrypoints/middleware.ts

@@ -0,0 +1,12 @@
+import type { MiddlewareHandler } from 'astro';
+
+export const onRequest: MiddlewareHandler = (context, next) => {
+	if (context.isPrerendered) {
+		// @ts-expect-error
+		context.locals.runtime ??= {
+			env: process.env,
+		};
+	}
+
+	return next();
+};

packages/integrations/cloudflare/src/entrypoints/server.ts

@@ -0,0 +1,96 @@
+import type {
+	CacheStorage as CLOUDFLARE_CACHESTORAGE,
+	Request as CLOUDFLARE_REQUEST,
+	ExecutionContext,
+} from '@cloudflare/workers-types';
+import type { SSRManifest } from 'astro';
+import { App } from 'astro/app';
+import { setGetEnv } from 'astro/env/setup';
+import { createGetEnv } from '../utils/env.js';
+
+type Env = {
+	[key: string]: unknown;
+	ASSETS: { fetch: (req: Request | string) => Promise<Response> };
+	ASTRO_STUDIO_APP_TOKEN?: string;
+};
+
+export interface Runtime<T extends object = object> {
+	runtime: {
+		env: Env & T;
+		cf: CLOUDFLARE_REQUEST['cf'];
+		caches: CLOUDFLARE_CACHESTORAGE;
+		ctx: ExecutionContext;
+	};
+}
+
+export function createExports(manifest: SSRManifest) {
+	const app = new App(manifest);
+
+	const fetch = async (
+		request: Request & CLOUDFLARE_REQUEST,
+		env: Env,
+		context: ExecutionContext,
+	) => {
+		const { pathname } = new URL(request.url);
+
+		// static assets fallback, in case default _routes.json is not used
+		if (manifest.assets.has(pathname)) {
+			return env.ASSETS.fetch(request.url.replace(/\.html$/, ''));
+		}
+
+		const routeData = app.match(request);
+		if (!routeData) {
+			// https://developers.cloudflare.com/pages/functions/api-reference/#envassetsfetch
+			const asset = await env.ASSETS.fetch(
+				request.url.replace(/index.html$/, '').replace(/\.html$/, ''),
+			);
+			if (asset.status !== 404) {
+				return asset;
+			}
+		}
+
+		Reflect.set(
+			request,
+			Symbol.for('astro.clientAddress'),
+			request.headers.get('cf-connecting-ip'),
+		);
+
+		process.env.ASTRO_STUDIO_APP_TOKEN ??= (() => {
+			if (typeof env.ASTRO_STUDIO_APP_TOKEN === 'string') {
+				return env.ASTRO_STUDIO_APP_TOKEN;
+			}
+		})();
+
+		const locals: Runtime = {
+			runtime: {
+				env: env,
+				cf: request.cf,
+				caches: caches as unknown as CLOUDFLARE_CACHESTORAGE,
+				ctx: {
+					waitUntil: (promise: Promise<any>) => context.waitUntil(promise),
+					// Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions
+					passThroughOnException: () => {
+						throw new Error(
+							'`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.',
+						);
+					},
+					props: {},
+				},
+			},
+		};
+
+		setGetEnv(createGetEnv(env));
+
+		const response = await app.render(request, { routeData, locals });
+
+		if (app.setCookieHeaders) {
+			for (const setCookieHeader of app.setCookieHeaders(response)) {
+				response.headers.append('Set-Cookie', setCookieHeader);
+			}
+		}
+
+		return response;
+	};
+
+	return { default: { fetch } };
+}