@astrojs/cloudflare 13.0.0-alpha.2 → 13.0.0-alpha.4

package/dist/entrypoints/preview.js

@@ -5,37 +5,29 @@ 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 { copyFileSync, existsSync } from "node:fs";
+import { cloudflareConfigCustomizer } from "../wrangler.js";
 const createPreviewServer = async ({
   logger,
   base,
-  outDir,
+  server,
   headers,
   port,
   host,
-  createCodegenDir,
   root
 }) => {
   const startServerTime = performance.now();
   let previewServer;
-  let cfPluginConfig = { viteEnvironment: { name: "ssr" } };
-  if (!hasWranglerConfig(outDir)) {
-    cfPluginConfig.config = defaultCloudflareConfig();
-    const codegenDir = createCodegenDir();
-    const devVarsPath = new URL(".dev.vars", outDir);
-    const devVarsCodegenPath = new URL(".dev.vars", codegenDir);
-    if (existsSync(devVarsPath)) {
-      copyFileSync(devVarsPath, devVarsCodegenPath);
-    }
-  }
+  const cfPluginConfig = {
+    viteEnvironment: { name: "ssr" },
+    config: cloudflareConfigCustomizer()
+  };
   try {
     previewServer = await preview({
       configFile: false,
       base,
       appType: "mpa",
       build: {
-        outDir: fileURLToPath(outDir)
+        outDir: fileURLToPath(server)
       },
       root: fileURLToPath(root),
       preview: {
@@ -91,7 +83,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.0.0-alpha.2";
+  const version = "13.0.0-alpha.4";
   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

@@ -1,24 +1,22 @@
-import { createReadStream, copyFileSync, existsSync, readFileSync } from "node:fs";
+import { createReadStream, existsSync, readFileSync } from "node:fs";
 import { appendFile, stat } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { createInterface } from "node:readline/promises";
 import { pathToFileURL } from "node:url";
-import {
-  appendForwardSlash,
-  prependForwardSlash,
-  removeLeadingForwardSlash
-} from "@astrojs/internal-helpers/path";
+import { removeLeadingForwardSlash } from "@astrojs/internal-helpers/path";
 import { createRedirectsFromAstroRoutes, printAsRedirects } from "@astrojs/underscore-redirects";
 import { cloudflare as cfVitePlugin } from "@cloudflare/vite-plugin";
 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";
-function wrapWithSlashes(path) {
-  return prependForwardSlash(appendForwardSlash(path));
-}
+import { sessionDrivers } from "astro/config";
 function createIntegration(args) {
   let _config;
   let finalBuildOutput;
@@ -26,57 +24,40 @@ 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,
-        createCodegenDir
-      }) => {
+      "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.`
-          );
           logger.info(
-            `If you see the error "Invalid binding \`${bindingName}\`" in your build output, you need to add the binding to your wrangler config file.`
+            `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.`
-          );
-          logger.info(
-            `If you see the error "Invalid binding \`${SESSION_KV_BINDING_NAME}\`" in your build output, you need to add the binding to your wrangler config file.`
+            `Enabling sessions with Cloudflare KV with the "${sessionKVBindingName}" KV binding.`
           );
           session = {
-            ...session,
-            driver: "cloudflare-kv-binding",
-            options: {
-              binding: SESSION_KV_BINDING_NAME,
-              ...session?.options
-            }
+            driver: sessionDrivers.cloudflareKVBinding({
+              binding: sessionKVBindingName
+            }),
+            cookie: session?.cookie,
+            ttl: session?.ttl
           };
         }
-        const cfPluginConfig = { viteEnvironment: { name: "ssr" } };
-        if (!hasWranglerConfig(config.root)) {
-          cfPluginConfig.config = defaultCloudflareConfig();
-          const codegenDir = createCodegenDir();
-          const devVarsPath = new URL(".dev.vars", config.root);
-          const devVarsCodegenPath = new URL(".dev.vars", codegenDir);
-          if (existsSync(devVarsPath)) {
-            copyFileSync(devVarsPath, devVarsCodegenPath);
-          }
-        }
+        const cfPluginConfig = {
+          viteEnvironment: { name: "ssr" },
+          config: cloudflareConfigCustomizer({
+            sessionKVBindingName: args?.sessionKVBindingName,
+            imagesBindingName: args?.imageService === "cloudflare-binding" ? args?.imagesBindingName : false
+          })
+        };
         updateConfig({
           build: {
-            client: new URL(`.${wrapWithSlashes(config.base)}`, config.outDir),
+            client: new URL(`./client/`, config.outDir),
             server: new URL("./_worker.js/", config.outDir),
             serverEntry: "index.js",
             redirects: false
@@ -122,6 +103,7 @@ function createIntegration(args) {
                           "astro > es-module-lexer",
                           "astro > unstorage",
                           "astro > neotraverse/modern",
+                          "astro > piccolore",
                           "astro/app",
                           "astro/compiler-runtime"
                         ],
@@ -136,8 +118,7 @@ function createIntegration(args) {
                   } else if (environmentName === "client") {
                     return {
                       optimizeDeps: {
-                        include: ["astro/runtime/client/dev-toolbar/entrypoint.js"],
-                        exclude: ["astro:*"]
+                        include: ["astro/runtime/client/dev-toolbar/entrypoint.js"]
                       }
                     };
                   }
@@ -155,7 +136,7 @@ function createIntegration(args) {
                 }
               },
               createConfigPlugin({
-                sessionKVBindingName: SESSION_KV_BINDING_NAME
+                sessionKVBindingName
               })
             ]
           },
@@ -244,7 +225,7 @@ function createIntegration(args) {
       "astro:build:done": async ({ pages, dir, logger, assets }) => {
         let redirectsExists = false;
         try {
-          const redirectsStat = await stat(new URL("./_redirects", _config.outDir));
+          const redirectsStat = await stat(new URL("./_redirects", _config.build.client));
           if (redirectsStat.isFile()) {
             redirectsExists = true;
           }
@@ -254,7 +235,7 @@ function createIntegration(args) {
         const redirects = [];
         if (redirectsExists) {
           const rl = createInterface({
-            input: createReadStream(new URL("./_redirects", _config.outDir)),
+            input: createReadStream(new URL("./_redirects", _config.build.client)),
             crlfDelay: Number.POSITIVE_INFINITY
           });
           for await (const line of rl) {
@@ -270,7 +251,7 @@ function createIntegration(args) {
         }
         let routesExists = false;
         try {
-          const routesStat = await stat(new URL("./_routes.json", _config.outDir));
+          const routesStat = await stat(new URL("./_routes.json", _config.build.client));
           if (routesStat.isFile()) {
             routesExists = true;
           }
@@ -302,7 +283,7 @@ function createIntegration(args) {
         if (!trueRedirects.empty()) {
           try {
             await appendFile(
-              new URL("./_redirects", _config.outDir),
+              new URL("./_redirects", _config.build.client),
               printAsRedirects(trueRedirects)
             );
           } catch (_error) {

package/dist/utils/handler.js

@@ -28,6 +28,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,29 +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",
-    main: "@astrojs/cloudflare/entrypoints/server",
-    assets: {
-      directory: "./dist",
-      binding: "ASSETS"
-    },
-    images: {
-      binding: "IMAGES"
-    },
-    kv_namespaces: [
-      {
-        binding: "SESSION",
-        id: "SESSION"
+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.2",
+  "version": "13.0.0-alpha.4",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -51,8 +51,8 @@
     "cheerio": "1.1.2",
     "devalue": "^5.5.0",
     "rollup": "^4.53.3",
-    "astro": "6.0.0-alpha.2",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "astro": "6.0.0-alpha.5"
   },
   "publishConfig": {
     "provenance": true