chore: update adapters to better support astro v5

packages/cloudflare/src/index.ts

@@ -1,4 +1,9 @@
-import type { AstroConfig, AstroIntegration, IntegrationRouteData } from 'astro';
+import type {
+	AstroConfig,
+	AstroIntegration,
+	IntegrationResolvedRoute,
+	IntegrationRouteData,
+} from 'astro';
 import type { PluginOption } from 'vite';
 
 import { createReadStream } from 'node:fs';
@@ -21,6 +26,7 @@ import { createGetEnv } from './utils/env.js';
 import { createRoutesFile, getParts } from './utils/generate-routes-json.js';
 import { setImageConfig } from './utils/image-config.js';
 
+export type IntegrationResolvedRouteWithDistUrl = IntegrationResolvedRoute & { distURL?: URL[] };
 export type { Runtime } from './entrypoints/server.js';
 
 export type Options = {
@@ -92,6 +98,8 @@ export default function createIntegration(args?: Options): AstroIntegration {
 		args?.cloudflareModules ?? true
 	);
 
+	let _routes: IntegrationResolvedRouteWithDistUrl[];
+
 	return {
 		name: '@astrojs/cloudflare',
 		hooks: {
@@ -137,6 +145,9 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					order: 'pre',
 				});
 			},
+			'astro:routes:resolved': ({ routes }) => {
+				_routes = routes;
+			},
 			'astro:config:done': ({ setAdapter, config, buildOutput, logger }) => {
 				if (buildOutput === 'static') {
 					logger.warn(
@@ -266,7 +277,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					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 +302,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)),
@@ -327,10 +338,16 @@ export default function createIntegration(args?: Options): AstroIntegration {
 				}
 
 				if (!routesExists) {
+					for (const route of _routes) {
+						const distURL = assets.get(route.pattern);
+						if (distURL) {
+							Object.assign(route, { distURL });
+						}
+					}
 					await createRoutesFile(
 						_config,
 						logger,
-						routes,
+						_routes,
 						pages,
 						redirects,
 						args?.routes?.extend?.include,
@@ -339,8 +356,22 @@ export default function createIntegration(args?: Options): AstroIntegration {
 				}
 
 				const redirectRoutes: [IntegrationRouteData, string][] = [];
-				for (const route of routes) {
-					if (route.type === 'redirect') redirectRoutes.push([route, '']);
+				for (const route of _routes) {
+					// TODO: Replace workaround after upstream @astrojs/underscore-redirects is changed, to support new IntegrationResolvedRoute type
+					if (route.type === 'redirect')
+						redirectRoutes.push([
+							{
+								pattern: route.patternRegex,
+								component: route.entrypoint,
+								prerender: route.isPrerendered,
+								route: route.pattern,
+								generate: route.generate,
+								params: route.params,
+								segments: route.segments,
+								type: route.type,
+							},
+							'',
+						]);
 				}
 
 				const trueRedirects = createRedirectsFromAstroRoutes({

packages/cloudflare/src/utils/generate-routes-json.ts

@@ -1,4 +1,5 @@
-import type { AstroConfig, AstroIntegrationLogger, IntegrationRouteData, RoutePart } from 'astro';
+import type { AstroConfig, AstroIntegrationLogger, RoutePart } from 'astro';
+import type { IntegrationResolvedRouteWithDistUrl } from '../index.js';
 
 import { existsSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
@@ -63,7 +64,10 @@ async function writeRoutesFileToOutDir(
 	}
 }
 
-function segmentsToCfSyntax(segments: IntegrationRouteData['segments'], _config: AstroConfig) {
+function segmentsToCfSyntax(
+	segments: IntegrationResolvedRouteWithDistUrl['segments'],
+	_config: AstroConfig
+) {
 	const pathSegments = [];
 	if (removeLeadingForwardSlash(removeTrailingForwardSlash(_config.base)).length > 0) {
 		pathSegments.push(removeLeadingForwardSlash(removeTrailingForwardSlash(_config.base)));
@@ -163,11 +167,11 @@ class PathTrie {
 export async function createRoutesFile(
 	_config: AstroConfig,
 	logger: AstroIntegrationLogger,
-	routes: IntegrationRouteData[],
+	routes: IntegrationResolvedRouteWithDistUrl[],
 	pages: {
 		pathname: string;
 	}[],
-	redirects: IntegrationRouteData['segments'][],
+	redirects: IntegrationResolvedRouteWithDistUrl['segments'][],
 	includeExtends:
 		| {
 				pattern: string;
@@ -223,17 +227,17 @@ export async function createRoutesFile(
 	let hasPrerendered404 = false;
 	for (const route of routes) {
 		const convertedPath = segmentsToCfSyntax(route.segments, _config);
-		if (route.pathname === '/404' && route.prerender === true) hasPrerendered404 = true;
+		if (route.pathname === '/404' && route.isPrerendered === true) hasPrerendered404 = true;
 
 		// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
 		switch (route.type) {
 			case 'page':
-				if (route.prerender === false) includePaths.push(convertedPath);
+				if (route.isPrerendered === false) includePaths.push(convertedPath);
 
 				break;
 
 			case 'endpoint':
-				if (route.prerender === false) includePaths.push(convertedPath);
+				if (route.isPrerendered === false) includePaths.push(convertedPath);
 				else excludePaths.push(convertedPath);
 
 				break;