@astrojs/cloudflare 13.0.1 → 13.1.0

package/dist/entrypoints/image-passthrough-endpoint.d.ts

@@ -0,0 +1,3 @@
+import type { APIRoute } from 'astro';
+export declare const prerender = false;
+export declare const GET: APIRoute;

package/dist/entrypoints/image-passthrough-endpoint.js

@@ -0,0 +1,49 @@
+import { imageConfig } from "astro:assets";
+import { isRemotePath } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
+import { env } from "cloudflare:workers";
+const prerender = false;
+const GET = async ({ request }) => {
+  try {
+    const url = new URL(request.url);
+    const href = url.searchParams.get("href");
+    if (!href) return new Response("Bad Request", { status: 400 });
+    const isRemote = isRemotePath(href);
+    let response;
+    if (isRemote) {
+      if (!isRemoteAllowed(href, imageConfig)) {
+        return new Response("Forbidden", { status: 403 });
+      }
+      response = await fetch(href, { redirect: "manual" });
+    } else {
+      const sourceUrl = new URL(href, url.origin);
+      if (sourceUrl.origin !== url.origin) {
+        return new Response("Forbidden", { status: 403 });
+      }
+      response = await env.ASSETS.fetch(new Request(sourceUrl, { headers: request.headers }));
+    }
+    if (response.status >= 300 && response.status < 400) {
+      return new Response("Not Found", { status: 404 });
+    }
+    if (!response.ok) {
+      return new Response("Not Found", { status: 404 });
+    }
+    const contentType = response.headers.get("Content-Type") ?? "";
+    if (!contentType.startsWith("image/")) {
+      return new Response("Forbidden", { status: 403 });
+    }
+    const headers = new Headers();
+    headers.set("Content-Type", contentType);
+    headers.set("Cache-Control", "public, max-age=31536000");
+    headers.set("Date", (/* @__PURE__ */ new Date()).toUTCString());
+    const etag = response.headers.get("ETag");
+    if (etag) headers.set("ETag", etag);
+    return new Response(response.body, { status: 200, headers });
+  } catch (_err) {
+    return new Response("Internal Server Error", { status: 500 });
+  }
+};
+export {
+  GET,
+  prerender
+};

package/dist/entrypoints/preview.js

@@ -1,3 +1,5 @@
+import { existsSync } from "node:fs";
+import { resolve as resolvePath } from "node:path";
 import {
   preview
 } from "vite";
@@ -14,6 +16,11 @@ const createPreviewServer = async ({
   host,
   root
 }) => {
+  const wranglerConfigPath = resolvePath(fileURLToPath(root), ".wrangler/deploy/config.json");
+  if (!existsSync(wranglerConfigPath)) {
+    logger.error("No build output found. Run `astro build` before running `astro preview`.");
+    process.exit(1);
+  }
   const startServerTime = performance.now();
   let previewServer;
   try {
@@ -80,7 +87,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.0.1";
+  const version = "13.1.0";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

package/dist/esbuild-plugin-astro-frontmatter.js

@@ -9,7 +9,7 @@ function astroFrontmatterScanPlugin() {
           const code = await readFile(args.path, "utf-8");
           const frontmatterMatch = FRONTMATTER_RE.exec(code);
           if (frontmatterMatch) {
-            const contents = frontmatterMatch[1].replace(/\breturn\b/g, "throw ");
+            const contents = frontmatterMatch[1].replace(/\breturn\s*;/g, "throw 0;").replace(/\breturn\b/g, "throw ");
             return {
               contents,
               loader: "ts"

package/dist/index.d.ts

@@ -25,6 +25,13 @@ export interface Options extends Pick<PluginConfig, 'auxiliaryWorkers' | 'config
      * See https://developers.cloudflare.com/images/transform-images/bindings/ for more details.
      */
     imagesBindingName?: string;
+    /**
+     * Controls which runtime is used for prerendering static pages at build time.
+     *
+     * - `'workerd'` (default): Uses Cloudflare's workerd runtime.
+     * - `'node'`: Uses Astro's default node prerender environment.
+     */
+    prerenderEnvironment?: 'workerd' | 'node';
     experimental?: Pick<NonNullable<PluginConfig['experimental']>, 'headersAndRedirectsDevModeSupport'>;
 }
-export default function createIntegration({ imageService, sessionKVBindingName, imagesBindingName, ...cloudflareOptions }?: Options): AstroIntegration;
+export default function createIntegration({ imageService, sessionKVBindingName, imagesBindingName, prerenderEnvironment, ...cloudflareOptions }?: Options): AstroIntegration;

package/dist/index.js

@@ -11,6 +11,7 @@ import {
   setImageConfig
 } from "./utils/image-config.js";
 import { createConfigPlugin } from "./vite-plugin-config.js";
+import { createNodePrerenderPlugin } from "./vite-plugin-dev-server-prerender-middleware.js";
 import {
   cloudflareConfigCustomizer,
   DEFAULT_SESSION_KV_BINDING_NAME,
@@ -19,11 +20,23 @@ import {
 import { parseEnv } from "node:util";
 import { sessionDrivers } from "astro/config";
 import { createCloudflarePrerenderer } from "./prerenderer.js";
-import { createRequire } from "node:module";
+const CLOUDFLARE_KV_SESSION_DRIVER_ENTRYPOINT = sessionDrivers.cloudflareKVBinding().entrypoint;
+function usesCloudflareKVSessionDriver(session) {
+  const driver = session?.driver;
+  if (!driver) {
+    return false;
+  }
+  if (typeof driver === "string") {
+    return driver === "cloudflareKVBinding" || driver === "cloudflare-kv-binding";
+  }
+  const entrypoint = typeof driver.entrypoint === "string" ? driver.entrypoint : driver.entrypoint.toString();
+  return entrypoint === CLOUDFLARE_KV_SESSION_DRIVER_ENTRYPOINT || entrypoint.endsWith("cloudflare-kv-binding");
+}
 function createIntegration({
   imageService,
   sessionKVBindingName = DEFAULT_SESSION_KV_BINDING_NAME,
   imagesBindingName = DEFAULT_IMAGES_BINDING_NAME,
+  prerenderEnvironment = "workerd",
   ...cloudflareOptions
 } = {}) {
   let _config;
@@ -62,22 +75,26 @@ function createIntegration({
             ttl: session?.ttl
           };
         }
+        const needsSessionKVBinding = usesCloudflareKVSessionDriver(session);
         const needsImagesBindingForDev = isCompile && command === "dev";
         cfPluginConfig = {
           config: cloudflareConfigCustomizer({
+            needsSessionKVBinding,
             sessionKVBindingName,
             imagesBindingName: needsImagesBinding || needsImagesBindingForDev ? imagesBindingName : false
           }),
-          experimental: {
-            prerenderWorker: {
-              config(_, { entryWorkerConfig }) {
-                return {
-                  ...entryWorkerConfig,
-                  name: "prerender",
-                  ...needsImagesBinding && !entryWorkerConfig.images && {
-                    images: { binding: imagesBindingName }
-                  }
-                };
+          ...prerenderEnvironment === "workerd" && {
+            experimental: {
+              prerenderWorker: {
+                config(_, { entryWorkerConfig }) {
+                  return {
+                    ...entryWorkerConfig,
+                    name: "prerender",
+                    ...needsImagesBinding && !entryWorkerConfig.images && {
+                      images: { binding: imagesBindingName }
+                    }
+                  };
+                }
               }
             }
           }
@@ -92,7 +109,12 @@ function createIntegration({
           session,
           vite: {
             plugins: [
-              cfVitePlugin({ ...cfPluginConfig, viteEnvironment: { name: "ssr" } }),
+              ...prerenderEnvironment === "node" && command === "dev" ? [createNodePrerenderPlugin()] : [],
+              cfVitePlugin({
+                ...cloudflareOptions,
+                ...cfPluginConfig,
+                viteEnvironment: { name: "ssr" }
+              }),
               {
                 name: "@astrojs/cloudflare:cf-imports",
                 enforce: "pre",
@@ -186,7 +208,7 @@ function createIntegration({
           image: setImageConfig(imageService, config.image, command, logger)
         });
         if (cloudflareOptions.configPath) {
-          addWatchFile(createRequire(import.meta.url).resolve(cloudflareOptions.configPath));
+          addWatchFile(new URL(cloudflareOptions.configPath, config.root));
         }
         addWatchFile(new URL("./wrangler.toml", config.root));
         addWatchFile(new URL("./wrangler.json", config.root));
@@ -240,17 +262,19 @@ function createIntegration({
         }
       },
       "astro:build:start": ({ setPrerenderer }) => {
-        setPrerenderer(
-          createCloudflarePrerenderer({
-            root: _config.root,
-            serverDir: _config.build.server,
-            clientDir: _config.build.client,
-            base: _config.base,
-            trailingSlash: _config.trailingSlash,
-            cfPluginConfig,
-            hasCompileImageService: buildService === "compile"
-          })
-        );
+        if (prerenderEnvironment === "workerd") {
+          setPrerenderer(
+            createCloudflarePrerenderer({
+              root: _config.root,
+              serverDir: _config.build.server,
+              clientDir: _config.build.client,
+              base: _config.base,
+              trailingSlash: _config.trailingSlash,
+              cfPluginConfig,
+              hasCompileImageService: buildService === "compile"
+            })
+          );
+        }
       },
       "astro:build:setup": ({ vite, target }) => {
         if (target === "server") {

package/dist/utils/image-binding-transform.js

@@ -1,6 +1,12 @@
 import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
 import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
+const qualityTable = {
+  low: 25,
+  mid: 50,
+  high: 80,
+  max: 100
+};
 async function transform(rawUrl, images, assets) {
   const url = new URL(rawUrl);
   const href = url.searchParams.get("href");
@@ -28,10 +34,11 @@ async function transform(rawUrl, images, assets) {
   return (await input.transform({
     width: url.searchParams.has("w") ? Number.parseInt(url.searchParams.get("w")) : void 0,
     height: url.searchParams.has("h") ? Number.parseInt(url.searchParams.get("h")) : void 0,
-    // `quality` is documented, but doesn't appear to work in manual testing...
-    // quality: url.searchParams.get('q'),
     fit: url.searchParams.get("fit")
-  }).output({ format: outputFormat })).response();
+  }).output({
+    quality: url.searchParams.get("q") ? qualityTable[url.searchParams.get("q")] ?? Number.parseInt(url.searchParams.get("q")) : void 0,
+    format: outputFormat
+  })).response();
 }
 export {
   transform

package/dist/utils/image-config.d.ts

@@ -10,12 +10,11 @@ export declare function normalizeImageServiceConfig(config: ImageServiceConfig |
     runtimeService: ImageServiceMode;
 };
 export declare function setImageConfig(service: ImageServiceConfig | undefined, config: AstroConfig['image'], command: HookParameters<'astro:config:setup'>['command'], logger: AstroIntegrationLogger): {
-    service: import("astro").ImageServiceConfig<Record<string, any>>;
+    service: {
+        entrypoint: string;
+    };
     endpoint: {
         entrypoint: string;
-    } | {
-        route: string;
-        entrypoint?: string | undefined;
     };
     domains: string[];
     remotePatterns: {
@@ -30,11 +29,10 @@ export declare function setImageConfig(service: ImageServiceConfig | undefined,
     objectPosition?: string | undefined;
     breakpoints?: number[] | undefined;
 } | {
-    service: {
-        entrypoint: string;
-    };
+    service: import("astro").ImageServiceConfig<Record<string, any>>;
     endpoint: {
-        entrypoint: string;
+        route: string;
+        entrypoint?: string | undefined;
     };
     domains: string[];
     remotePatterns: {

package/dist/utils/image-config.js

@@ -13,6 +13,9 @@ function normalizeImageServiceConfig(config) {
   };
 }
 const GENERIC_ENDPOINT = { entrypoint: "astro/assets/endpoint/generic" };
+const CLOUDFLARE_PASSTHROUGH_ENDPOINT = {
+  entrypoint: "@astrojs/cloudflare/image-passthrough-endpoint"
+};
 const WORKERD_IMAGE_SERVICE = { entrypoint: "@astrojs/cloudflare/image-service-workerd" };
 function setImageConfig(service, config, command, logger) {
   const { buildService, runtimeService } = normalizeImageServiceConfig(service);
@@ -21,7 +24,7 @@ function setImageConfig(service, config, command, logger) {
       return {
         ...config,
         service: passthroughImageService(),
-        endpoint: command === "dev" ? GENERIC_ENDPOINT : config.endpoint
+        endpoint: command === "dev" ? GENERIC_ENDPOINT : CLOUDFLARE_PASSTHROUGH_ENDPOINT
       };
     case "cloudflare":
       return {
@@ -42,7 +45,7 @@ function setImageConfig(service, config, command, logger) {
         service: WORKERD_IMAGE_SERVICE,
         // Dev: IMAGES binding (via Cloudflare Vite plugin) for real transforms.
         // Build: endpoint depends on runtime - `cloudflare-binding` uses IMAGES, `passthrough` uses generic.
-        endpoint: command === "dev" || runtimeService === "cloudflare-binding" ? { entrypoint: "@astrojs/cloudflare/image-transform-endpoint" } : GENERIC_ENDPOINT
+        endpoint: command === "dev" || runtimeService === "cloudflare-binding" ? { entrypoint: "@astrojs/cloudflare/image-transform-endpoint" } : CLOUDFLARE_PASSTHROUGH_ENDPOINT
       };
     case "custom":
       return { ...config };

package/dist/vite-plugin-dev-server-prerender-middleware.d.ts

@@ -0,0 +1,6 @@
+import type * as vite from 'vite';
+/**
+ * Enables Astro core prerender middleware in dev so prerendered routes can
+ * run in Node while non-prerendered routes continue through workerd.
+ */
+export declare function createNodePrerenderPlugin(): vite.Plugin;

package/dist/vite-plugin-dev-server-prerender-middleware.js

@@ -0,0 +1,26 @@
+const devPrerenderMiddlewareSymbol = /* @__PURE__ */ Symbol.for("astro.devPrerenderMiddleware");
+function createNodePrerenderPlugin() {
+  return {
+    name: "@astrojs/cloudflare:dev-server-prerender-middleware",
+    config() {
+      return {
+        environments: {
+          prerender: { dev: {} }
+        }
+      };
+    },
+    // Disable dep optimization for the `prerender` environment so dependencies
+    // are loaded via native import() with correct import.meta.url semantics.
+    configEnvironment(environmentName) {
+      if (environmentName === "prerender") {
+        return { optimizeDeps: { noDiscovery: true, include: [] } };
+      }
+    },
+    configureServer(server) {
+      server[devPrerenderMiddlewareSymbol] = true;
+    }
+  };
+}
+export {
+  createNodePrerenderPlugin
+};

package/dist/wrangler.d.ts

@@ -4,6 +4,7 @@ export declare const DEFAULT_IMAGES_BINDING_NAME = "IMAGES";
 export declare const DEFAULT_ASSETS_BINDING_NAME = "ASSETS";
 interface CloudflareConfigOptions {
     sessionKVBindingName: string | undefined;
+    needsSessionKVBinding?: boolean;
     imagesBindingName: string | false | undefined;
 }
 /**

package/dist/wrangler.js

@@ -3,6 +3,7 @@ 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 needsSessionKVBinding = options?.needsSessionKVBinding ?? true;
   const imagesBindingName = options?.imagesBindingName === false ? void 0 : options?.imagesBindingName ?? DEFAULT_IMAGES_BINDING_NAME;
   return (config) => {
     const hasSessionBinding = config.kv_namespaces?.some(
@@ -12,7 +13,7 @@ function cloudflareConfigCustomizer(options) {
     const hasAssetsBinding = config.assets?.binding !== void 0;
     return {
       main: config.main ?? "@astrojs/cloudflare/entrypoints/server",
-      kv_namespaces: hasSessionBinding ? void 0 : [
+      kv_namespaces: !needsSessionKVBinding || hasSessionBinding ? void 0 : [
         {
           binding: sessionKVBindingName
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -25,6 +25,7 @@
     "./entrypoints/server.js": "./dist/entrypoints/server.js",
     "./image-service": "./dist/entrypoints/image-service-external.js",
     "./image-transform-endpoint": "./dist/entrypoints/image-transform-endpoint.js",
+    "./image-passthrough-endpoint": "./dist/entrypoints/image-passthrough-endpoint.js",
     "./image-service-workerd": "./dist/entrypoints/image-service-workerd.js",
     "./handler": "./dist/utils/handler.js",
     "./types.d.ts": "./types.d.ts",
@@ -51,8 +52,8 @@
     "@types/node": "^25.2.2",
     "cheerio": "1.2.0",
     "devalue": "^5.6.3",
-    "astro": "6.0.0",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "astro": "6.0.3"
   },
   "publishConfig": {
     "provenance": true