@astrojs/cloudflare 14.0.0-beta.2 → 14.0.0

package/dist/cache/index.d.ts

@@ -0,0 +1,10 @@
+import type { CacheProviderConfig } from 'astro';
+/**
+ * Configure the Cloudflare Workers cache provider for Astro route caching.
+ *
+ * Uses `Cloudflare-CDN-Cache-Control` and `Cache-Tag` headers for
+ * Cloudflare's built-in Worker caching layer. Responses are auto-tagged
+ * with the request path so that both tag-based and path-based invalidation
+ * are implemented via tag purging through the Worker cache API.
+ */
+export declare function cacheCloudflare(): CacheProviderConfig;

package/dist/cache/index.js

@@ -0,0 +1,9 @@
+function cacheCloudflare() {
+  return {
+    name: "cloudflare",
+    entrypoint: "@astrojs/cloudflare/cache/provider"
+  };
+}
+export {
+  cacheCloudflare
+};

package/dist/cache/provider.d.ts

@@ -0,0 +1,3 @@
+import type { CacheProviderFactory } from 'astro';
+declare const factory: CacheProviderFactory;
+export default factory;

package/dist/cache/provider.js

@@ -0,0 +1,35 @@
+import {
+  buildCacheControlDirectives,
+  collectInvalidationTags,
+  pathTag,
+  setConditionalHeaders
+} from "astro/cache/provider-utils";
+const factory = () => {
+  return {
+    name: "cloudflare",
+    setHeaders(options, request) {
+      const headers = new Headers();
+      const directives = buildCacheControlDirectives(options, ["public"]);
+      if (directives) {
+        headers.set("Cloudflare-CDN-Cache-Control", directives);
+      }
+      const tags = [...options.tags ?? []];
+      const { pathname } = new URL(request.url);
+      tags.push(pathTag(pathname));
+      headers.set("Cache-Tag", tags.join(","));
+      setConditionalHeaders(headers, options);
+      return headers;
+    },
+    async invalidate(options) {
+      const { cache } = await import("cloudflare:workers");
+      const tags = collectInvalidationTags(options);
+      if (tags.length > 0) {
+        await cache.purge({ tags });
+      }
+    }
+  };
+};
+var provider_default = factory;
+export {
+  provider_default as default
+};

package/dist/entrypoints/preview.js

@@ -88,7 +88,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "14.0.0-beta.2";
+  const version = "14.0.0";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

package/dist/index.js

@@ -105,11 +105,14 @@ function createIntegration({
         const needsImagesBindingForDev = isCompile && command === "dev";
         const usesContentCollections = hasContentCollectionsConfig(config.srcDir);
         const prebundleContentRuntime = command === "dev" && usesContentCollections;
+        const isTypeGenPhase = command === "build" || command === "sync";
+        const needsWorkerCache = config.cache?.provider?.name === "cloudflare";
         const adapterPluginConfig = {
           config: cloudflareConfigCustomizer({
             needsSessionKVBinding,
             sessionKVBindingName,
-            imagesBindingName: needsImagesBinding || needsImagesBindingForDev ? imagesBindingName : false
+            imagesBindingName: needsImagesBinding || needsImagesBindingForDev ? imagesBindingName : false,
+            needsWorkerCache
           }),
           ...prerenderEnvironment === "workerd" && {
             experimental: {
@@ -142,6 +145,16 @@ function createIntegration({
         ];
         const isAstroPrismPackageInstalled = await getIsAstroPrismInstalled(config.root);
         const userOptimizeDeps = config.vite?.optimizeDeps;
+        const cloudflareVitePlugins = cfVitePlugin({
+          ...cfPluginConfig,
+          viteEnvironment: { name: "ssr" },
+          assetsOnly: () => _buildOutput === "static"
+        });
+        if (isTypeGenPhase) {
+          for (const plugin of cloudflareVitePlugins) {
+            plugin.configureServer = void 0;
+          }
+        }
         updateConfig({
           build: {
             redirects: false
@@ -150,11 +163,7 @@ function createIntegration({
           vite: {
             plugins: [
               ...prerenderEnvironment === "node" && command === "dev" ? [createNodePrerenderPlugin()] : [],
-              cfVitePlugin({
-                ...cfPluginConfig,
-                viteEnvironment: { name: "ssr" },
-                assetsOnly: () => _buildOutput === "static"
-              }),
+              cloudflareVitePlugins,
               {
                 name: "@astrojs/cloudflare:cf-imports",
                 enforce: "pre",
@@ -170,6 +179,9 @@ function createIntegration({
               {
                 name: "@astrojs/cloudflare:environment",
                 configEnvironment(environmentName, _options) {
+                  if (isTypeGenPhase) {
+                    return { optimizeDeps: { noDiscovery: true, include: [] } };
+                  }
                   const isServerEnvironment = ["astro", "ssr", "prerender"].includes(
                     environmentName
                   );
@@ -260,7 +272,8 @@ function createIntegration({
                   assetsPrefix: typeof config.build.assetsPrefix === "string" ? config.build.assetsPrefix : void 0,
                   imageServiceEntrypoint: "@astrojs/cloudflare/image-service-workerd",
                   buildAssets: config.build.assets ?? "_astro"
-                } : null
+                } : null,
+                cacheProviderEnabled: needsWorkerCache
               }),
               cfPrismPlugin()
             ]
@@ -360,7 +373,7 @@ function createIntegration({
       },
       "astro:build:done": async ({ dir, logger, assets }) => {
         if (_config.base !== "/") {
-          for (const file of [".assetsignore", "_headers"]) {
+          for (const file of [".assetsignore", "_headers", "_redirects"]) {
             try {
               await rename(
                 new URL(`./${file}`, _config.build.client),

package/dist/utils/handler.js

@@ -1,5 +1,9 @@
 import { env as globalEnv } from "cloudflare:workers";
-import { compileImageConfig, isPrerender } from "virtual:astro-cloudflare:config";
+import {
+  compileImageConfig,
+  isPrerender,
+  cacheProviderEnabled
+} from "virtual:astro-cloudflare:config";
 import { createApp } from "astro/app/entrypoint";
 import { setGetEnv } from "astro/env/setup";
 import { createGetEnv } from "../utils/env.js";
@@ -67,6 +71,9 @@ async function handle(request, env, context) {
       response.headers.append("Set-Cookie", setCookieHeader);
     }
   }
+  if (cacheProviderEnabled && !response.headers.has("Cloudflare-CDN-Cache-Control")) {
+    response.headers.set("Cloudflare-CDN-Cache-Control", "no-store");
+  }
   return response;
 }
 export {

package/dist/vite-plugin-config.d.ts

@@ -9,5 +9,12 @@ export interface Config {
     sessionKVBindingName: string;
     compileImageConfig: CompileImageConfig | null;
     isPrerender: boolean;
+    /**
+     * True when the user has configured the Cloudflare cache provider.
+     * Used by the request handler to default uncached responses to
+     * `Cloudflare-CDN-Cache-Control: no-store`, so that opting in to the
+     * cache provider never accidentally caches routes that don't use it.
+     */
+    cacheProviderEnabled: boolean;
 }
 export declare function createConfigPlugin(config: Omit<Config, 'isPrerender'>): PluginOption;

package/dist/wrangler.d.ts

@@ -6,6 +6,7 @@ interface CloudflareConfigOptions {
     sessionKVBindingName?: string | undefined;
     needsSessionKVBinding?: boolean;
     imagesBindingName?: string | false | undefined;
+    needsWorkerCache?: boolean;
 }
 /**
  * Returns a config customizer that sets up the Astro Cloudflare defaults.

package/dist/wrangler.js

@@ -6,6 +6,7 @@ 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;
+  const needsWorkerCache = options?.needsWorkerCache ?? false;
   const customizer = (config) => {
     const getNonInheritableBindings = (nonInheritableConfig) => {
       const hasSessionBinding = nonInheritableConfig?.kv_namespaces?.some(
@@ -27,6 +28,8 @@ function cloudflareConfigCustomizer(options) {
       assets: hasAssetsBinding ? void 0 : {
         binding: DEFAULT_ASSETS_BINDING_NAME
       },
+      // Enable the Worker caching layer when a Cloudflare cache provider is configured
+      cache: needsWorkerCache && !config.cache?.enabled ? { enabled: true } : void 0,
       previews: getNonInheritableBindings(config.previews)
     };
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers",
-  "version": "14.0.0-beta.2",
+  "version": "14.0.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -26,6 +26,8 @@
     "./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",
+    "./cache": "./dist/cache/index.js",
+    "./cache/provider": "./dist/cache/provider.js",
     "./handler": "./dist/utils/handler.js",
     "./fetch": "./dist/fetch.js",
     "./hono": "./dist/hono.js",
@@ -55,7 +57,7 @@
     "cheerio": "1.2.0",
     "devalue": "^5.8.1",
     "prismjs": "^1.30.0",
-    "astro": "7.0.0-beta.3",
+    "astro": "7.0.0",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {