@astrojs/cloudflare 13.5.4 → 13.6.0

package/dist/entrypoints/preview.js

@@ -41,7 +41,7 @@ const createPreviewServer = async ({
         allowedHosts
       },
       plugins: [
-        cfVitePlugin({ ...globalThis.astroCloudflareOptions, viteEnvironment: { name: "ssr" } })
+        cfVitePlugin({ ...globalThis.astroCloudflareConfig, viteEnvironment: { name: "ssr" } })
       ]
     });
   } catch (err) {
@@ -88,7 +88,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.5.4";
+  const version = "13.6.0";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

package/dist/fetch.d.ts

@@ -0,0 +1,12 @@
+import type { FetchState } from 'astro/fetch';
+/**
+ * Applies Cloudflare-specific setup to a `FetchState`:
+ * - Injects the SESSION KV binding
+ * - Serves static assets via the ASSETS binding
+ * - Sets `locals.cfContext`, client address, `waitUntil`, and error page fetch
+ *
+ * Returns a `Response` if the request was handled by the ASSETS binding
+ * (static file hit). Returns `undefined` when the caller should continue
+ * to Astro rendering.
+ */
+export declare function cf(state: FetchState, env: Env, ctx: ExecutionContext): Promise<Response | undefined>;

package/dist/fetch.js

@@ -0,0 +1,31 @@
+import { env as globalEnv } from "cloudflare:workers";
+import { createApp } from "astro/app/entrypoint";
+import { setGetEnv } from "astro/env/setup";
+import { createGetEnv } from "./utils/env.js";
+import {
+  injectSessionBinding,
+  matchStaticAsset,
+  fallbackToAssets,
+  createErrorPageFetch,
+  createLocals,
+  getClientAddress
+} from "./utils/cf.js";
+setGetEnv(createGetEnv(globalEnv));
+const app = createApp();
+async function cf(state, env, ctx) {
+  injectSessionBinding(app.manifest, env);
+  const staticAsset = matchStaticAsset(app.manifest, state.request.url, env);
+  if (staticAsset) return staticAsset;
+  if (!state.routeData) {
+    const asset = await fallbackToAssets(state.request.url, env);
+    if (asset) return asset;
+  }
+  Object.assign(state.locals, createLocals(ctx));
+  state.clientAddress = getClientAddress(state.request);
+  state.renderOptions.waitUntil = ctx.waitUntil.bind(ctx);
+  state.renderOptions.prerenderedErrorPageFetch = createErrorPageFetch(env);
+  return void 0;
+}
+export {
+  cf
+};

package/dist/hono.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Duck-typed Hono context — matches Hono's `Context` shape for
+ * Cloudflare Workers without importing from `hono` at runtime.
+ */
+type HonoCloudflareContextLike = {
+    req: {
+        raw: Request;
+    };
+    env: Env;
+    executionCtx: ExecutionContext;
+    get?: (key: string) => unknown;
+    set?: (key: string, value: unknown) => void;
+};
+type HonoMiddlewareHandler = (context: HonoCloudflareContextLike, next: () => Promise<void>) => Promise<Response | void>;
+/**
+ * Hono middleware that applies Cloudflare-specific setup.
+ *
+ * Reads `env` and `executionCtx` from the Hono context (provided
+ * automatically by Hono on Cloudflare Workers). Handles static assets
+ * via the ASSETS binding, injects the SESSION KV binding, and sets
+ * `locals.cfContext`, client address, `waitUntil`, and error page fetch.
+ *
+ * If the request matches a static asset, returns the asset response
+ * directly. Otherwise calls `next()` to continue the middleware chain.
+ */
+export declare function cf(): HonoMiddlewareHandler;
+export {};

package/dist/hono.js

@@ -0,0 +1,21 @@
+import { FetchState } from "astro/fetch";
+import { cf as cfFetch } from "./fetch.js";
+const FETCH_STATE_KEY = "fetchState";
+function getFetchState(context) {
+  const state = context.get?.(FETCH_STATE_KEY);
+  if (state) return state;
+  const nextState = new FetchState(context.req.raw);
+  context.set?.(FETCH_STATE_KEY, nextState);
+  return nextState;
+}
+function cf() {
+  return async (context, next) => {
+    const state = getFetchState(context);
+    const asset = await cfFetch(state, context.env, context.executionCtx);
+    if (asset) return asset;
+    await next();
+  };
+}
+export {
+  cf
+};

package/dist/index.js

@@ -1,5 +1,8 @@
 import { createReadStream, existsSync, readFileSync } from "node:fs";
-import { appendFile, readFile, rename, stat } from "node:fs/promises";
+import { appendFile, readFile, rename, stat, writeFile } from "node:fs/promises";
+import { relative } from "node:path";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
 import { createInterface } from "node:readline/promises";
 import { removeLeadingForwardSlash } from "@astrojs/internal-helpers/path";
 import { createRedirectsFromAstroRoutes, printAsRedirects } from "@astrojs/underscore-redirects";
@@ -58,9 +61,9 @@ function createIntegration({
   ...cloudflareOptions
 } = {}) {
   let _config;
+  let _buildOutput;
   let _originalClientDir;
   let _routes;
-  let _isFullyStatic = false;
   let cfPluginConfig;
   const { buildService, runtimeService } = normalizeImageServiceConfig(imageService);
   const needsImagesBinding = runtimeService === "cloudflare-binding";
@@ -98,7 +101,7 @@ function createIntegration({
         const needsImagesBindingForDev = isCompile && command === "dev";
         const usesContentCollections = hasContentCollectionsConfig(config.srcDir);
         const prebundleContentRuntime = command === "dev" && usesContentCollections;
-        cfPluginConfig = {
+        const adapterPluginConfig = {
           config: cloudflareConfigCustomizer({
             needsSessionKVBinding,
             sessionKVBindingName,
@@ -124,8 +127,9 @@ function createIntegration({
             }
           }
         };
+        cfPluginConfig = { ...cloudflareOptions, ...adapterPluginConfig };
         if (command === "preview") {
-          globalThis.astroCloudflareOptions = cfPluginConfig;
+          globalThis.astroCloudflareConfig = cfPluginConfig;
         }
         const prismFiles = [
           "@astrojs/prism > prismjs",
@@ -143,9 +147,9 @@ function createIntegration({
             plugins: [
               ...prerenderEnvironment === "node" && command === "dev" ? [createNodePrerenderPlugin()] : [],
               cfVitePlugin({
-                ...cloudflareOptions,
                 ...cfPluginConfig,
-                viteEnvironment: { name: "ssr" }
+                viteEnvironment: { name: "ssr" },
+                assetsOnly: () => _buildOutput === "static"
               }),
               {
                 name: "@astrojs/cloudflare:cf-imports",
@@ -266,11 +270,10 @@ function createIntegration({
       },
       "astro:routes:resolved": ({ routes }) => {
         _routes = routes;
-        const nonInternalRoutes = routes.filter((route) => route.origin !== "internal");
-        _isFullyStatic = nonInternalRoutes.length > 0 && nonInternalRoutes.every((route) => route.isPrerendered);
       },
-      "astro:config:done": ({ setAdapter, config, injectTypes, logger }) => {
+      "astro:config:done": ({ setAdapter, config, injectTypes, logger, buildOutput }) => {
         _config = config;
+        _buildOutput = buildOutput;
         _originalClientDir = new URL(config.build.client.href);
         if (config.base !== "/") {
           config.build.client = new URL("." + config.base + "/", config.build.client);
@@ -282,9 +285,10 @@ function createIntegration({
         setAdapter({
           name: "@astrojs/cloudflare",
           adapterFeatures: {
-            buildOutput: "server",
+            buildOutput,
             middlewareMode: "classic",
-            preserveBuildClientDir: true
+            preserveBuildClientDir: true,
+            preserveBuildServerDir: true
           },
           entrypointResolution: "auto",
           previewEntrypoint: "@astrojs/cloudflare/entrypoints/preview",
@@ -319,7 +323,6 @@ function createIntegration({
         if (prerenderEnvironment === "workerd") {
           setPrerenderer(
             createCloudflarePrerenderer({
-              cloudflareOptions,
               root: _config.root,
               serverDir: _config.build.server,
               clientDir: _config.build.client,
@@ -360,6 +363,18 @@ function createIntegration({
             } catch {
             }
           }
+          try {
+            const wranglerJsonUrl = new URL("./wrangler.json", _config.build.server);
+            const raw = await readFile(wranglerJsonUrl, "utf-8");
+            const wranglerConfig = JSON.parse(raw);
+            if (wranglerConfig.assets?.directory) {
+              wranglerConfig.assets.directory = normalizePath(
+                relative(fileURLToPath(_config.build.server), fileURLToPath(_originalClientDir))
+              );
+              await writeFile(wranglerJsonUrl, JSON.stringify(wranglerConfig));
+            }
+          } catch {
+          }
         }
         let redirectsExists = false;
         try {
@@ -395,7 +410,7 @@ function createIntegration({
             )
           ),
           dir,
-          buildOutput: _isFullyStatic ? "static" : "server",
+          buildOutput: _buildOutput,
           assets
         });
         if (!trueRedirects.empty()) {

package/dist/prerenderer.d.ts

@@ -1,7 +1,6 @@
 import type { AstroConfig, AstroPrerenderer } from 'astro';
 import { type PluginConfig } from '@cloudflare/vite-plugin';
 interface CloudflarePrerendererOptions {
-    cloudflareOptions: Partial<PluginConfig>;
     root: AstroConfig['root'];
     serverDir: AstroConfig['build']['server'];
     clientDir: AstroConfig['build']['client'];
@@ -14,5 +13,5 @@ interface CloudflarePrerendererOptions {
  * Creates a prerenderer that uses Cloudflare's workerd runtime via a preview server.
  * This allows prerendering to happen in the same runtime that will serve the pages.
  */
-export declare function createCloudflarePrerenderer({ cloudflareOptions, root, serverDir, clientDir, base, trailingSlash, cfPluginConfig, hasCompileImageService, }: CloudflarePrerendererOptions): AstroPrerenderer;
+export declare function createCloudflarePrerenderer({ root, serverDir, clientDir, base, trailingSlash, cfPluginConfig, hasCompileImageService, }: CloudflarePrerendererOptions): AstroPrerenderer;
 export {};

package/dist/prerenderer.js

@@ -9,7 +9,6 @@ import {
   STATIC_IMAGES_ENDPOINT
 } from "./utils/prerender-constants.js";
 function createCloudflarePrerenderer({
-  cloudflareOptions,
   root,
   serverDir,
   clientDir,
@@ -49,13 +48,7 @@ function createCloudflarePrerenderer({
           // Let the OS pick a free port
           open: false
         },
-        plugins: [
-          cfVitePlugin({
-            ...cloudflareOptions,
-            ...cfPluginConfig,
-            viteEnvironment: { name: "prerender" }
-          })
-        ]
+        plugins: [cfVitePlugin({ ...cfPluginConfig, viteEnvironment: { name: "prerender" } })]
       });
       const address = previewServer.httpServer.address();
       if (address && typeof address === "object") {

package/dist/utils/cf-helpers.d.ts

@@ -0,0 +1,33 @@
+export interface Runtime {
+    cfContext: ExecutionContext;
+}
+/** Minimal manifest shape needed by the Cloudflare helpers. */
+export interface ManifestLike {
+    assets: Set<string>;
+    sessionConfig?: {
+        options?: Record<string, unknown>;
+    } | undefined;
+}
+/**
+ * Returns a `Response` from the ASSETS binding if the request pathname
+ * is a known static asset. Returns `undefined` otherwise.
+ */
+export declare function matchStaticAsset(manifest: ManifestLike, requestUrl: string, env: Env): Response | undefined;
+/**
+ * Tries the ASSETS binding as a fallback for an unmatched route.
+ * Returns the asset `Response` if found (non-404), `undefined` otherwise.
+ */
+export declare function fallbackToAssets(requestUrl: string, env: Env): Promise<Response | undefined>;
+/**
+ * Creates a fetch function for prerendered error pages via the ASSETS binding.
+ */
+export declare function createErrorPageFetch(env: Env): (url: string) => Promise<Response>;
+/**
+ * Creates the Cloudflare-specific locals object with `cfContext`
+ * and deprecated `runtime` property getters.
+ */
+export declare function createLocals(ctx: ExecutionContext): Runtime;
+/**
+ * Extracts the client IP address from the `cf-connecting-ip` header.
+ */
+export declare function getClientAddress(request: Request): string | undefined;

package/dist/utils/cf-helpers.js

@@ -0,0 +1,63 @@
+import { getValidatedIpFromHeader } from "@astrojs/internal-helpers/request";
+function matchStaticAsset(manifest, requestUrl, env) {
+  const { pathname } = new URL(requestUrl);
+  if (manifest.assets.has(pathname)) {
+    return env.ASSETS.fetch(requestUrl.replace(/\.html$/, ""));
+  }
+  return void 0;
+}
+async function fallbackToAssets(requestUrl, env) {
+  const asset = await env.ASSETS.fetch(
+    requestUrl.replace(/index.html$/, "").replace(/\.html$/, "")
+  );
+  if (asset.status !== 404) {
+    return asset;
+  }
+  return void 0;
+}
+function createErrorPageFetch(env) {
+  return async (url) => {
+    return env.ASSETS.fetch(url.replace(/\.html$/, ""));
+  };
+}
+function createLocals(ctx) {
+  const locals = {
+    cfContext: ctx
+  };
+  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.`
+        );
+      }
+    }
+  });
+  return locals;
+}
+function getClientAddress(request) {
+  return getValidatedIpFromHeader(request.headers.get("cf-connecting-ip"));
+}
+export {
+  createErrorPageFetch,
+  createLocals,
+  fallbackToAssets,
+  getClientAddress,
+  matchStaticAsset
+};

package/dist/utils/cf.d.ts

@@ -0,0 +1,8 @@
+import type { ManifestLike } from './cf-helpers.js';
+export type { Runtime, ManifestLike } from './cf-helpers.js';
+export { matchStaticAsset, fallbackToAssets, createErrorPageFetch, createLocals, getClientAddress, } from './cf-helpers.js';
+/**
+ * Injects the SESSION KV binding into the app manifest's session config.
+ * Idempotent — safe to call on every request.
+ */
+export declare function injectSessionBinding(manifest: ManifestLike, env: Env): void;

package/dist/utils/cf.js

@@ -0,0 +1,24 @@
+import { sessionKVBindingName } from "virtual:astro-cloudflare:config";
+import {
+  matchStaticAsset,
+  fallbackToAssets,
+  createErrorPageFetch,
+  createLocals,
+  getClientAddress
+} from "./cf-helpers.js";
+function injectSessionBinding(manifest, env) {
+  if (env[sessionKVBindingName]) {
+    const sessionConfigOptions = manifest.sessionConfig?.options ?? {};
+    Object.assign(sessionConfigOptions, {
+      binding: env[sessionKVBindingName]
+    });
+  }
+}
+export {
+  createErrorPageFetch,
+  createLocals,
+  fallbackToAssets,
+  getClientAddress,
+  injectSessionBinding,
+  matchStaticAsset
+};

package/dist/utils/handler.d.ts

@@ -1,9 +1,7 @@
-export interface Runtime {
-    cfContext: ExecutionContext;
-}
+import { type Runtime } from './cf.js';
+export type { Runtime };
 declare global {
     var __ASTRO_IMAGES_BINDING_NAME: string;
 }
 type CfResponse = Awaited<ReturnType<Required<ExportedHandler<Env>>['fetch']>>;
 export declare function handle(request: Request, env: Env, context: ExecutionContext): Promise<CfResponse>;
-export {};

package/dist/utils/handler.js

@@ -1,9 +1,5 @@
 import { env as globalEnv } from "cloudflare:workers";
-import {
-  sessionKVBindingName,
-  compileImageConfig,
-  isPrerender
-} from "virtual:astro-cloudflare:config";
+import { compileImageConfig, isPrerender } from "virtual:astro-cloudflare:config";
 import { createApp } from "astro/app/entrypoint";
 import { setGetEnv } from "astro/env/setup";
 import { createGetEnv } from "../utils/env.js";
@@ -15,7 +11,14 @@ import {
   isStaticImagesRequest,
   handleStaticImagesRequest
 } from "./prerender.js";
-import { getValidatedIpFromHeader } from "@astrojs/internal-helpers/request";
+import {
+  injectSessionBinding,
+  matchStaticAsset,
+  fallbackToAssets,
+  createErrorPageFetch,
+  createLocals,
+  getClientAddress
+} from "./cf.js";
 setGetEnv(createGetEnv(globalEnv));
 const app = createApp();
 async function handle(request, env, context) {
@@ -34,16 +37,9 @@ async function handle(request, env, context) {
       return handleStaticImagesRequest();
     }
   }
-  const { pathname: requestPathname } = new URL(request.url);
-  if (env[sessionKVBindingName]) {
-    const sessionConfigOptions = app.manifest.sessionConfig?.options ?? {};
-    Object.assign(sessionConfigOptions, {
-      binding: env[sessionKVBindingName]
-    });
-  }
-  if (app.manifest.assets.has(requestPathname)) {
-    return env.ASSETS.fetch(request.url.replace(/\.html$/, ""));
-  }
+  injectSessionBinding(app.manifest, env);
+  const staticAsset = matchStaticAsset(app.manifest, request.url, env);
+  if (staticAsset) return staticAsset;
   let routeData = void 0;
   if (app.isDev()) {
     const result = await app.devMatch(app.getPathnameFromRequest(request));
@@ -54,50 +50,17 @@ async function handle(request, env, context) {
     routeData = app.match(request);
   }
   if (!routeData) {
-    const asset = await env.ASSETS.fetch(
-      request.url.replace(/index.html$/, "").replace(/\.html$/, "")
-    );
-    if (asset.status !== 404) {
-      return asset;
-    }
+    const asset = await fallbackToAssets(request.url, env);
+    if (asset) return asset;
   }
-  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 locals = createLocals(context);
   const waitUntil = context.waitUntil.bind(context);
   const response = await app.render(request, {
     routeData,
     locals,
     waitUntil,
-    prerenderedErrorPageFetch: async (url) => {
-      return env.ASSETS.fetch(url.replace(/\.html$/, ""));
-    },
-    clientAddress: getValidatedIpFromHeader(request.headers.get("cf-connecting-ip"))
+    prerenderedErrorPageFetch: createErrorPageFetch(env),
+    clientAddress: getClientAddress(request)
   });
   if (app.setCookieHeaders) {
     for (const setCookieHeader of app.setCookieHeaders(response)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers",
-  "version": "13.5.4",
+  "version": "13.6.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -27,6 +27,8 @@
     "./image-passthrough-endpoint": "./dist/entrypoints/image-passthrough-endpoint.js",
     "./image-service-workerd": "./dist/entrypoints/image-service-workerd.js",
     "./handler": "./dist/utils/handler.js",
+    "./fetch": "./dist/fetch.js",
+    "./hono": "./dist/hono.js",
     "./types.d.ts": "./types.d.ts",
     "./package.json": "./package.json"
   },
@@ -35,11 +37,11 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@cloudflare/vite-plugin": "^1.32.3",
+    "@cloudflare/vite-plugin": "^1.39.0",
     "piccolore": "^0.1.3",
     "tinyglobby": "^0.2.15",
     "vite": "^7.3.2",
-    "@astrojs/internal-helpers": "0.9.1",
+    "@astrojs/internal-helpers": "0.10.0",
     "@astrojs/underscore-redirects": "1.0.3"
   },
   "peerDependencies": {
@@ -53,7 +55,7 @@
     "cheerio": "1.2.0",
     "devalue": "^5.6.3",
     "prismjs": "^1.30.0",
-    "astro": "6.3.7",
+    "astro": "6.4.0",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {