@astrojs/cloudflare 13.0.0-alpha.3 → 13.0.0-beta.0

package/dist/entrypoints/preview.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
 import { cloudflare as cfVitePlugin } from "@cloudflare/vite-plugin";
 import colors from "piccolore";
 import { performance } from "node:perf_hooks";
-import { hasWranglerConfig, defaultCloudflareConfig } from "../wrangler.js";
+import { cloudflareConfigCustomizer } from "../wrangler.js";
 const createPreviewServer = async ({
   logger,
   base,
@@ -17,10 +17,10 @@ const createPreviewServer = async ({
 }) => {
   const startServerTime = performance.now();
   let previewServer;
-  let cfPluginConfig = { viteEnvironment: { name: "ssr" } };
-  if (!hasWranglerConfig(server)) {
-    cfPluginConfig.config = defaultCloudflareConfig();
-  }
+  const cfPluginConfig = {
+    viteEnvironment: { name: "ssr" },
+    config: cloudflareConfigCustomizer()
+  };
   try {
     previewServer = await preview({
       configFile: false,
@@ -83,7 +83,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.0.0-alpha.3";
+  const version = "13.0.0-beta.0";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

package/dist/index.d.ts

@@ -37,45 +37,23 @@ export type Options = {
      */
     cloudflareModules?: boolean;
     /**
-     * By default, Astro will be configured to use Cloudflare KV to store session data. If you want to use sessions,
-     * you must create a KV namespace and declare it in your wrangler config file. You can do this with the wrangler command:
+     * By default, Astro will be configured to use Cloudflare KV to store session data. The KV namespace
+     * will be automatically provisioned when you deploy.
      *
-     * ```sh
-     * npx wrangler kv namespace create SESSION
-     * ```
-     *
-     * This will log the id of the created namespace. You can then add it to your `wrangler.json` file like this:
-     *
-     * ```json
-     * {
-     *   "kv_namespaces": [
-     *     {
-     *       "binding": "SESSION",
-     *       "id": "<your kv namespace id here>"
-     *     }
-     *   ]
-     * }
-     * ```
-     * By default, the driver looks for the binding named `SESSION`, but you can override this by providing a different name here.
-     *
-     * See https://developers.cloudflare.com/kv/concepts/kv-namespaces/ for more details on using KV namespaces.
+     * By default, the binding is named `SESSION`, but you can override this by providing a different name here.
+     * If you define the binding manually in your wrangler config, Astro will use your configuration instead.
      *
+     * See https://developers.cloudflare.com/workers/wrangler/configuration/#automatic-provisioning for more details.
      */
     sessionKVBindingName?: string;
     /**
-     * When configured as `cloudflare-binding`, the Cloudflare Images binding will be used to transform images:
-     * - https://developers.cloudflare.com/images/transform-images/bindings/
-     *
-     * By default, this will use the "IMAGES" binding name, but this can be customised in your `wrangler.json`:
+     * When `imageService` is set to `cloudflare-binding`, the Cloudflare Images binding will be used
+     * to transform images. The binding will be automatically configured for you.
      *
-     * ```json
-     * {
-     *   "images": {
-     *     "binding": "IMAGES" // <-- this should match `imagesBindingName`
-     *   }
-     * }
-     * ```
+     * By default, the binding is named `IMAGES`, but you can override this by providing a different name here.
+     * If you define the binding manually in your wrangler config, Astro will use your configuration instead.
      *
+     * See https://developers.cloudflare.com/images/transform-images/bindings/ for more details.
      */
     imagesBindingName?: string;
     /**

package/dist/index.js

@@ -10,7 +10,11 @@ import { cloudflareModuleLoader } from "./utils/cloudflare-module-loader.js";
 import { createRoutesFile, getParts } from "./utils/generate-routes-json.js";
 import { setImageConfig } from "./utils/image-config.js";
 import { createConfigPlugin } from "./vite-plugin-config.js";
-import { hasWranglerConfig, defaultCloudflareConfig } from "./wrangler.js";
+import {
+  cloudflareConfigCustomizer,
+  DEFAULT_SESSION_KV_BINDING_NAME,
+  DEFAULT_IMAGES_BINDING_NAME
+} from "./wrangler.js";
 import { parse } from "dotenv";
 import { sessionDrivers } from "astro/config";
 function createIntegration(args) {
@@ -20,34 +24,37 @@ function createIntegration(args) {
     args?.cloudflareModules ?? true
   );
   let _routes;
-  const SESSION_KV_BINDING_NAME = args?.sessionKVBindingName ?? "SESSION";
+  const sessionKVBindingName = args?.sessionKVBindingName ?? DEFAULT_SESSION_KV_BINDING_NAME;
+  const imagesBindingName = args?.imagesBindingName ?? DEFAULT_IMAGES_BINDING_NAME;
   return {
     name: "@astrojs/cloudflare",
     hooks: {
       "astro:config:setup": ({ command, config, updateConfig, logger, addWatchFile }) => {
         let session = config.session;
         if (args?.imageService === "cloudflare-binding") {
-          const bindingName = args?.imagesBindingName ?? "IMAGES";
           logger.info(
-            `Enabling image processing with Cloudflare Images for production with the "${bindingName}" Images binding.`
+            `Enabling image processing with Cloudflare Images for production with the "${imagesBindingName}" Images binding.`
           );
         }
         if (!session?.driver) {
           logger.info(
-            `Enabling sessions with Cloudflare KV with the "${SESSION_KV_BINDING_NAME}" KV binding.`
+            `Enabling sessions with Cloudflare KV with the "${sessionKVBindingName}" KV binding.`
           );
           session = {
             driver: sessionDrivers.cloudflareKVBinding({
-              binding: SESSION_KV_BINDING_NAME
+              binding: sessionKVBindingName
             }),
             cookie: session?.cookie,
             ttl: session?.ttl
           };
         }
-        const cfPluginConfig = { viteEnvironment: { name: "ssr" } };
-        if (!hasWranglerConfig(config.root)) {
-          cfPluginConfig.config = defaultCloudflareConfig();
-        }
+        const cfPluginConfig = {
+          viteEnvironment: { name: "ssr" },
+          config: cloudflareConfigCustomizer({
+            sessionKVBindingName: args?.sessionKVBindingName,
+            imagesBindingName: args?.imageService === "cloudflare-binding" ? args?.imagesBindingName : false
+          })
+        };
         updateConfig({
           build: {
             client: new URL(`./client/`, config.outDir),
@@ -129,7 +136,7 @@ function createIntegration(args) {
                 }
               },
               createConfigPlugin({
-                sessionKVBindingName: SESSION_KV_BINDING_NAME
+                sessionKVBindingName
               })
             ]
           },

package/dist/utils/handler.js

@@ -16,7 +16,17 @@ async function handle(request, env, context) {
   if (app.manifest.assets.has(pathname)) {
     return env.ASSETS.fetch(request.url.replace(/\.html$/, ""));
   }
-  const routeData = app.match(request);
+  let routeData = void 0;
+  if (app.isDev()) {
+    const result = await app.devMatch(
+      app.getPathnameFromRequest(request)
+    );
+    if (result) {
+      routeData = result.routeData;
+    }
+  } else {
+    routeData = app.match(request);
+  }
   if (!routeData) {
     const asset = await env.ASSETS.fetch(
       request.url.replace(/index.html$/, "").replace(/\.html$/, "")
@@ -28,6 +38,31 @@ async function handle(request, env, context) {
   const locals = {
     cfContext: context
   };
+  Object.defineProperty(locals, "runtime", {
+    enumerable: false,
+    value: {
+      get env() {
+        throw new Error(
+          `Astro.locals.runtime.env has been removed in Astro v6. Use 'import { env } from "cloudflare:workers"' instead.`
+        );
+      },
+      get cf() {
+        throw new Error(
+          `Astro.locals.runtime.cf has been removed in Astro v6. Use 'Astro.request.cf' instead.`
+        );
+      },
+      get caches() {
+        throw new Error(
+          `Astro.locals.runtime.caches has been removed in Astro v6. Use the global 'caches' object instead.`
+        );
+      },
+      get ctx() {
+        throw new Error(
+          `Astro.locals.runtime.ctx has been removed in Astro v6. Use 'Astro.locals.cfContext' instead.`
+        );
+      }
+    }
+  });
   const response = await app.render(
     request,
     {

package/dist/wrangler.d.ts

@@ -1,10 +1,14 @@
 import type { PluginConfig } from '@cloudflare/vite-plugin';
+export declare const DEFAULT_SESSION_KV_BINDING_NAME = "SESSION";
+export declare const DEFAULT_IMAGES_BINDING_NAME = "IMAGES";
+export declare const DEFAULT_ASSETS_BINDING_NAME = "ASSETS";
+interface CloudflareConfigOptions {
+    sessionKVBindingName?: string;
+    imagesBindingName?: string | false;
+}
 /**
- * Checks whether a wrangler file exists at the given path
- * @param root
+ * Returns a config customizer that sets up the Astro Cloudflare defaults.
+ * Sets the main entrypoint and adds bindings for auto-provisioning.
  */
-export declare function hasWranglerConfig(root: URL): boolean;
-/**
- * Returns the default wrangler configuration used by Astro Cloudflare configuration.
- */
-export declare function defaultCloudflareConfig(): PluginConfig['config'];
+export declare function cloudflareConfigCustomizer(options?: CloudflareConfigOptions): PluginConfig['config'];
+export {};

package/dist/wrangler.js

@@ -1,30 +1,34 @@
-import { existsSync } from "node:fs";
-function hasWranglerConfig(root) {
-  return existsSync(new URL("wrangler.jsonc", root)) || existsSync(new URL("wrangler.toml", root)) || existsSync(new URL("wrangler.json", root));
-}
-function defaultCloudflareConfig() {
-  return {
-    // TODO: better way to handle name, maybe package.json#name ?
-    name: "test-application",
-    compatibility_date: "2025-05-21",
-    compatibility_flags: ["global_fetch_strictly_public"],
-    main: "@astrojs/cloudflare/entrypoints/server",
-    assets: {
-      directory: "./dist",
-      binding: "ASSETS"
-    },
-    images: {
-      binding: "IMAGES"
-    },
-    kv_namespaces: [
-      {
-        binding: "SESSION"
-        // KV with no binding gets automatically created
+const DEFAULT_SESSION_KV_BINDING_NAME = "SESSION";
+const DEFAULT_IMAGES_BINDING_NAME = "IMAGES";
+const DEFAULT_ASSETS_BINDING_NAME = "ASSETS";
+function cloudflareConfigCustomizer(options) {
+  const sessionKVBindingName = options?.sessionKVBindingName ?? DEFAULT_SESSION_KV_BINDING_NAME;
+  const imagesBindingName = options?.imagesBindingName === false ? void 0 : options?.imagesBindingName ?? DEFAULT_IMAGES_BINDING_NAME;
+  return (config) => {
+    const hasSessionBinding = config.kv_namespaces?.some(
+      (kv) => kv.binding === sessionKVBindingName
+    );
+    const hasImagesBinding = config.images?.binding !== void 0;
+    const hasAssetsBinding = config.assets?.binding !== void 0;
+    return {
+      main: config.main ?? "@astrojs/cloudflare/entrypoints/server",
+      kv_namespaces: hasSessionBinding ? void 0 : [
+        {
+          binding: sessionKVBindingName
+        }
+      ],
+      images: hasImagesBinding || !imagesBindingName ? void 0 : {
+        binding: imagesBindingName
+      },
+      assets: hasAssetsBinding ? void 0 : {
+        binding: DEFAULT_ASSETS_BINDING_NAME
       }
-    ]
+    };
   };
 }
 export {
-  defaultCloudflareConfig,
-  hasWranglerConfig
+  DEFAULT_ASSETS_BINDING_NAME,
+  DEFAULT_IMAGES_BINDING_NAME,
+  DEFAULT_SESSION_KV_BINDING_NAME,
+  cloudflareConfigCustomizer
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "13.0.0-alpha.3",
+  "version": "13.0.0-beta.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -40,18 +40,18 @@
     "piccolore": "^0.1.3",
     "tinyglobby": "^0.2.15",
     "vite": "^7.1.12",
-    "wrangler": "4.53.0",
-    "@astrojs/internal-helpers": "0.7.5",
-    "@astrojs/underscore-redirects": "1.0.0"
+    "@astrojs/underscore-redirects": "1.0.0",
+    "@astrojs/internal-helpers": "0.7.5"
   },
   "peerDependencies": {
-    "astro": "^6.0.0-alpha.0"
+    "astro": "^6.0.0-alpha.0",
+    "wrangler": "^4.53.0"
   },
   "devDependencies": {
     "cheerio": "1.1.2",
-    "devalue": "^5.5.0",
-    "rollup": "^4.53.3",
-    "astro": "6.0.0-alpha.3",
+    "devalue": "^5.6.1",
+    "rollup": "^4.54.0",
+    "astro": "6.0.0-beta.0",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {