diff --git a/.changeset/sweet-feet-happen.md b/.changeset/sweet-feet-happen.md new file mode 100644 index 000000000000..6bc1118372da --- /dev/null +++ b/.changeset/sweet-feet-happen.md @@ -0,0 +1,5 @@ +--- +'@astrojs/cloudflare': patch +--- + +Removes an unused function re-export from the `/info` package path diff --git a/.changeset/tame-hairs-scream.md b/.changeset/tame-hairs-scream.md new file mode 100644 index 000000000000..0381fa13774e --- /dev/null +++ b/.changeset/tame-hairs-scream.md @@ -0,0 +1,7 @@ +--- +'astro': patch +--- + +Uses today’s date for Cloudflare `compatibility_date` in `astro add cloudflare` + +When creating new projects, `astro add cloudflare` now sets `compatibility_date` to the current date. Previously, this date was resolved from locally installed packages, which could be unreliable in some package manager environments. Using today’s date is simpler and more reliable across environments, and is supported by [`workerd`](https://github.com/cloudflare/workers-sdk/pull/13051). diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts index b1e2b27f3383..22927cc7ef74 100644 --- a/packages/astro/src/cli/add/index.ts +++ b/packages/astro/src/cli/add/index.ts @@ -1,5 +1,4 @@ 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 * as clack from '@clack/prompts'; @@ -217,18 +216,7 @@ 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); - } + let compatibilityDate = new Date().toISOString().slice(0, 10); await fs.writeFile( wranglerConfigURL, diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index fff7e7bd3d8e..791cc77a9080 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -19,7 +19,6 @@ "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", diff --git a/packages/integrations/cloudflare/src/info.ts b/packages/integrations/cloudflare/src/info.ts deleted file mode 100644 index 26b1a053ee7b..000000000000 --- a/packages/integrations/cloudflare/src/info.ts +++ /dev/null @@ -1,5 +0,0 @@ -/** - * 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';