in astro add cloudflare use cloudflare/vite-plugin's function to get latest compatibility date for wrangler.jsonc scaffolding (#15386)

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>

Author: OliverSpeir

.changeset/long-trams-see.md

@@ -0,0 +1,6 @@
+---
+'@astrojs/cloudflare': patch
+'astro': patch
+---
+
+Updates `astro add cloudflare` to use the latest valid `compatibility_date` in the wrangler config, if available

knip.js

@@ -48,6 +48,8 @@ export default {
 				'rehype-toc',
 				'remark-code-titles',
 				'@types/http-cache-semantics',
+				// Dynamically imported by astro add cloudflare
+				'@astrojs/cloudflare',
 			],
 		},
 		'packages/db': {

packages/astro/src/cli/add/index.ts

@@ -1,4 +1,5 @@
 import fsMod, { existsSync, promises as fs } from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import boxen from 'boxen';
@@ -81,9 +82,9 @@ export default async function seed() {
 	// TODO
 }
 `,
-	CLOUDFLARE_WRANGLER_CONFIG: (name: string) => `\
+	CLOUDFLARE_WRANGLER_CONFIG: (name: string, compatibilityDate: string) => `\
 {
-	"compatibility_date": ${JSON.stringify(new Date().toISOString().slice(0, 10))},
+	"compatibility_date": ${JSON.stringify(compatibilityDate)},
 	"compatibility_flags": ["global_fetch_strictly_public"],
 	"name": ${JSON.stringify(name)},
 	"main": "@astrojs/cloudflare/entrypoints/server",
@@ -217,10 +218,22 @@ export async function add(names: string[], { flags }: AddOptions) {
 
 					if (await askToContinue({ flags, logger })) {
 						const data = await getPackageJson();
+						let compatibilityDate: string;
+						try {
+							const require = createRequire(root);
+							const { getLocalWorkerdCompatibilityDate } = await import(
+								require.resolve('@astrojs/cloudflare/info')
+							);
+							({ date: compatibilityDate } = getLocalWorkerdCompatibilityDate({
+								projectPath: rootPath,
+							}));
+						} catch {
+							compatibilityDate = new Date().toISOString().slice(0, 10);
+						}
 
 						await fs.writeFile(
 							wranglerConfigURL,
-							STUBS.CLOUDFLARE_WRANGLER_CONFIG(data?.name ?? 'example'),
+							STUBS.CLOUDFLARE_WRANGLER_CONFIG(data?.name ?? 'example', compatibilityDate),
 							'utf-8',
 						);
 					}

packages/integrations/cloudflare/package.json

@@ -19,6 +19,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/",
   "exports": {
     ".": "./dist/index.js",
+    "./info": "./dist/info.js",
     "./entrypoints/server": "./dist/entrypoints/server.js",
     "./entrypoints/preview": "./dist/entrypoints/preview.js",
     "./entrypoints/server.js": "./dist/entrypoints/server.js",

packages/integrations/cloudflare/src/info.ts

@@ -0,0 +1,5 @@
+/**
+ * Re-exports utilities for use by astro add CLI.
+ * This provides a resolvable path from the user's project.
+ */
+export { getLocalWorkerdCompatibilityDate } from '@cloudflare/vite-plugin';