.gitignore

@@ -12,6 +12,7 @@ package-lock.json
 .pnpm-store
 .idea/
 **/fixtures/**/.astro
+**/hosted/**/.astro
 
 # ignore top-level vscode settings
 /.vscode/settings.json

package.json

@@ -29,35 +29,26 @@
   "packageManager": "pnpm@9.7.1",
   "pnpm": {
     "peerDependencyRules": {
-      "ignoreMissing": [
-        "rollup",
-        "@babel/core",
-        "@babel/plugin-transform-react-jsx",
-        "vite",
-        "react",
-        "react-dom",
-        "@types/react"
-      ],
       "allowAny": ["astro", "vite"]
     }
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
     "@biomejs/biome": "1.9.4",
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.10",
-    "@types/node": "^22.10.0",
+    "@changesets/cli": "^2.27.11",
+    "@types/node": "^22.10.6",
     "esbuild": "^0.24.0",
-    "eslint": "^9.15.0",
+    "eslint": "^9.18.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-regexp": "^2.7.0",
     "only-allow": "^1.2.1",
-    "prettier": "^3.4.1",
+    "prettier": "^3.4.2",
     "prettier-plugin-astro": "^0.14.1",
     "turbo": "^2.3.3",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.16.0"
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.20.0"
   }
 }

packages/cloudflare/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @astrojs/cloudflare
 
+## 12.2.1
+
+### Patch Changes
+
+- [#506](https://github.com/withastro/adapters/pull/506) [`ce66003`](https://github.com/withastro/adapters/commit/ce66003c093daa0e53a7ab1cf46ddd1d4ddcbee4) Thanks [@bluwy](https://github.com/bluwy)! - Removes internal `vue` handling
+
+## 12.2.0
+
+### Minor Changes
+
+- [#496](https://github.com/withastro/adapters/pull/496) [`4b5cd22`](https://github.com/withastro/adapters/commit/4b5cd2268e8ed5e720772f50241b299762ea1eb8) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Stabilizes `astro:env` secrets support
+
+### Patch Changes
+
+- [#454](https://github.com/withastro/adapters/pull/454) [`83cedad`](https://github.com/withastro/adapters/commit/83cedad780bf7a23ae9f6ca0c44a7b7f1c1767e1) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Improves Astro 5 support
+
+- [#501](https://github.com/withastro/adapters/pull/501) [`012b31d`](https://github.com/withastro/adapters/commit/012b31d98ce87c1199eb38b7aba2a28b7c1cf8cc) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Refactor of the redirects logic
+
+## 12.1.0
+
+### Minor Changes
+
+- [#455](https://github.com/withastro/adapters/pull/455) [`1d4e6fc`](https://github.com/withastro/adapters/commit/1d4e6fca41b67277a21dcf2a42910e12206a0299) Thanks [@meyer](https://github.com/meyer)! - Adds `wrangler.jsonc` to the default watched config files. If a config file is specified in `platformProxy.configPath`, that file location is watched instead of the defaults.
+
+### Patch Changes
+
+- [#476](https://github.com/withastro/adapters/pull/476) [`a8a8ab1`](https://github.com/withastro/adapters/commit/a8a8ab12d9cfb5157e6a350b93a505010367b8e4) Thanks [@bluwy](https://github.com/bluwy)! - Removes resolving with "node" conditionto fix Vue imports
+
+## 12.0.1
+
+### Patch Changes
+
+- [#465](https://github.com/withastro/adapters/pull/465) [`70e0054`](https://github.com/withastro/adapters/commit/70e0054aade5368f1bd9b1595766826af7e9ec8d) Thanks [@bluwy](https://github.com/bluwy)! - Fixes setting custom `workerd` and `worker` conditions for the ssr environment only
+
 ## 12.0.0
 
 ### Major Changes

packages/cloudflare/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "12.0.0",
+  "version": "12.2.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -28,30 +28,29 @@
     "test": "astro-scripts test \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
-    "@cloudflare/workers-types": "^4.20241112.0",
-    "@inox-tools/astro-when": "^0.2.4",
+    "@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.14",
-    "miniflare": "^3.20241106.1",
+    "magic-string": "^0.30.17",
+    "miniflare": "^3.20241230.1",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.91.0"
+    "vite": "^6.0.7",
+    "wrangler": "^3.101.0"
   },
   "peerDependencies": {
     "astro": "^5.0.0"
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^5.0.0-alpha.15",
+    "astro": "^5.1.6",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",
-    "fast-glob": "^3.3.2",
-    "rollup": "^4.27.4",
-    "strip-ansi": "^7.1.0",
-    "vite": "6.0.1"
+    "fast-glob": "^3.3.3",
+    "rollup": "^4.30.1",
+    "strip-ansi": "^7.1.0"
   },
   "publishConfig": {
     "provenance": true

packages/cloudflare/src/entrypoints/middleware.ts

@@ -1,23 +1,12 @@
-import { When, whenAmI } from '@it-astro:when';
 import type { MiddlewareHandler } from 'astro';
 
-const middlewares: Record<When, MiddlewareHandler> = {
-	[When.Client]: () => {
-		throw new Error('Client should not run a middleware!');
-	},
-	[When.DevServer]: (_, next) => next(),
-	[When.Server]: (_, next) => next(),
-	[When.Prerender]: (ctx, next) => {
+export const onRequest: MiddlewareHandler = (context, next) => {
+	if (context.isPrerendered) {
 		// @ts-expect-error
-		if (ctx.locals.runtime === undefined) {
-			// @ts-expect-error
-			ctx.locals.runtime = {
-				env: process.env,
-			};
-		}
-		return next();
-	},
-	[When.StaticBuild]: (_, next) => next(),
-};
+		context.locals.runtime ??= {
+			env: process.env,
+		};
+	}
 
-export const onRequest = middlewares[whenAmI];
+	return next();
+};

packages/cloudflare/src/entrypoints/server.ts

@@ -74,6 +74,7 @@ export function createExports(manifest: SSRManifest) {
 							'`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.'
 						);
 					},
+					props: {},
 				},
 			},
 		};

packages/cloudflare/src/index.ts

@@ -1,4 +1,9 @@
-import type { AstroConfig, AstroIntegration, IntegrationRouteData } from 'astro';
+import type {
+	AstroConfig,
+	AstroIntegration,
+	HookParameters,
+	IntegrationResolvedRoute,
+} from 'astro';
 import type { PluginOption } from 'vite';
 
 import { createReadStream } from 'node:fs';
@@ -10,8 +15,8 @@ import {
 	removeLeadingForwardSlash,
 } from '@astrojs/internal-helpers/path';
 import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
-import astroWhen from '@inox-tools/astro-when';
 import { AstroError } from 'astro/errors';
+import { defaultClientConditions } from 'vite';
 import { type GetPlatformProxyOptions, getPlatformProxy } from 'wrangler';
 import {
 	type CloudflareModulePluginExtra,
@@ -87,11 +92,14 @@ function setProcessEnv(config: AstroConfig, env: Record<string, unknown>) {
 
 export default function createIntegration(args?: Options): AstroIntegration {
 	let _config: AstroConfig;
+	let finalBuildOutput: HookParameters<'astro:config:done'>['buildOutput'];
 
 	const cloudflareModulePlugin: PluginOption & CloudflareModulePluginExtra = cloudflareModuleLoader(
 		args?.cloudflareModules ?? true
 	);
 
+	let _routes: IntegrationResolvedRoute[];
+
 	return {
 		name: '@astrojs/cloudflare',
 		hooks: {
@@ -127,16 +135,23 @@ export default function createIntegration(args?: Options): AstroIntegration {
 							},
 						],
 					},
-					integrations: [astroWhen()],
 					image: setImageConfig(args?.imageService ?? 'compile', config.image, command, logger),
 				});
-				addWatchFile(new URL('./wrangler.toml', config.root));
-				addWatchFile(new URL('./wrangler.json', config.root));
+				if (args?.platformProxy?.configPath) {
+					addWatchFile(new URL(args.platformProxy.configPath, config.root));
+				} else {
+					addWatchFile(new URL('./wrangler.toml', config.root));
+					addWatchFile(new URL('./wrangler.json', config.root));
+					addWatchFile(new URL('./wrangler.jsonc', config.root));
+				}
 				addMiddleware({
 					entrypoint: '@astrojs/cloudflare/entrypoints/middleware.js',
 					order: 'pre',
 				});
 			},
+			'astro:routes:resolved': ({ routes }) => {
+				_routes = routes;
+			},
 			'astro:config:done': ({ setAdapter, config, buildOutput, logger }) => {
 				if (buildOutput === 'static') {
 					logger.warn(
@@ -145,6 +160,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 				}
 
 				_config = config;
+				finalBuildOutput = buildOutput;
 
 				setAdapter({
 					name: '@astrojs/cloudflare',
@@ -159,8 +175,12 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						hybridOutput: 'stable',
 						staticOutput: 'unsupported',
 						i18nDomains: 'experimental',
-						sharpImageService: 'limited',
-						envGetSecret: 'experimental',
+						sharpImageService: {
+							support: 'limited',
+							message:
+								'Cloudflare does not support sharp. You can use the `compile` image service to compile images at build time. It will not work for any on-demand rendered images.',
+						},
+						envGetSecret: 'stable',
 					},
 				});
 			},
@@ -213,60 +233,32 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						}
 					}
 
-					vite.resolve.conditions ||= [];
-					// We need those conditions, previous these conditions where applied at the esbuild step which we removed
-					// https://github.com/withastro/astro/pull/7092
-					vite.resolve.conditions.push('workerd', 'worker');
-
+					// Support `workerd` and `worker` conditions for the ssr environment
+					// (previously supported in esbuild instead: https://github.com/withastro/astro/pull/7092)
 					vite.ssr ||= {};
+					vite.ssr.resolve ||= {};
+					vite.ssr.resolve.conditions ||= [...defaultClientConditions];
+					vite.ssr.resolve.conditions.push('workerd', 'worker');
+
 					vite.ssr.target = 'webworker';
 					vite.ssr.noExternal = true;
 
-					if (typeof _config.vite.ssr?.external === 'undefined') vite.ssr.external = [];
-					if (typeof _config.vite.ssr?.external === 'boolean')
-						vite.ssr.external = _config.vite.ssr?.external;
-					if (Array.isArray(_config.vite.ssr?.external))
-						// `@astrojs/vue` sets `@vue/server-renderer` to external
-						// https://github.com/withastro/astro/blob/e648c5575a8774af739231cfa9fc27a32086aa5f/packages/integrations/vue/src/index.ts#L119
-						// the cloudflare adapter needs to get all dependencies inlined, we use `noExternal` for that, but any `external` config overrides that
-						// therefore we need to remove `@vue/server-renderer` from the external config again
-						vite.ssr.external = _config.vite.ssr?.external.filter(
-							(entry) => entry !== '@vue/server-renderer'
-						);
-
 					vite.build ||= {};
 					vite.build.rollupOptions ||= {};
 					vite.build.rollupOptions.output ||= {};
 					// @ts-expect-error
 					vite.build.rollupOptions.output.banner ||=
 						'globalThis.process ??= {}; globalThis.process.env ??= {};';
 
-					vite.build.rollupOptions.external = _config.vite.build?.rollupOptions?.external ?? [];
-
 					// Cloudflare env is only available per request. This isn't feasible for code that access env vars
 					// in a global way, so we shim their access as `process.env.*`. This is not the recommended way for users to access environment variables. But we'll add this for compatibility for chosen variables. Mainly to support `@astrojs/db`
 					vite.define = {
 						'process.env': 'process.env',
 						...vite.define,
 					};
 				}
-				// we thought that vite config inside `if (target === 'server')` would not apply for client
-				// but it seems like the same `vite` reference is used for both
-				// so we need to reset the previous conflicting setting
-				// in the future we should look into a more robust solution
-				if (target === 'client') {
-					vite.resolve ||= {};
-					vite.resolve.conditions ||= [];
-					vite.resolve.conditions = vite.resolve.conditions.filter(
-						(c) => c !== 'workerd' && c !== 'worker'
-					);
-
-					vite.build ||= {};
-					vite.build.rollupOptions ||= {};
-					vite.build.rollupOptions.output ||= {};
-				}
 			},
-			'astro:build:done': async ({ pages, routes, dir, logger }) => {
+			'astro:build:done': async ({ pages, dir, logger, assets }) => {
 				await cloudflareModulePlugin.afterBuildCompleted(_config);
 				const PLATFORM_FILES = ['_headers', '_redirects', '_routes.json'];
 				if (_config.base !== '/') {
@@ -291,7 +283,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					redirectsExists = false;
 				}
 
-				const redirects: IntegrationRouteData['segments'][] = [];
+				const redirects: IntegrationResolvedRoute['segments'][] = [];
 				if (redirectsExists) {
 					const rl = createInterface({
 						input: createReadStream(new URL('./_redirects', _config.outDir)),
@@ -330,23 +322,26 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					await createRoutesFile(
 						_config,
 						logger,
-						routes,
+						_routes,
 						pages,
 						redirects,
 						args?.routes?.extend?.include,
 						args?.routes?.extend?.exclude
 					);
 				}
 
-				const redirectRoutes: [IntegrationRouteData, string][] = [];
-				for (const route of routes) {
-					if (route.type === 'redirect') redirectRoutes.push([route, '']);
-				}
-
 				const trueRedirects = createRedirectsFromAstroRoutes({
 					config: _config,
-					routeToDynamicTargetMap: new Map(Array.from(redirectRoutes)),
+					routeToDynamicTargetMap: new Map(
+						Array.from(
+							_routes
+								.filter((route) => route.type === 'redirect')
+								.map((route) => [route, ''] as const)
+						)
+					),
 					dir,
+					buildOutput: finalBuildOutput,
+					assets,
 				});
 
 				if (!trueRedirects.empty()) {