@astrojs/cloudflare 14.0.0-alpha.1 → 14.0.0-beta.3

package/dist/entrypoints/preview.js

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

package/dist/index.js

@@ -1,14 +1,18 @@
 import { createReadStream, existsSync, readFileSync } from "node:fs";
-import { appendFile, readFile, rename, stat, writeFile } from "node:fs/promises";
+import { appendFile, readFile, rename, stat, unlink, 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 {
+  removeLeadingForwardSlash,
+  removeTrailingForwardSlash
+} from "@astrojs/internal-helpers/path";
 import { createRedirectsFromAstroRoutes, printAsRedirects } from "@astrojs/underscore-redirects";
 import { cloudflare as cfVitePlugin } from "@cloudflare/vite-plugin";
 import { astroFrontmatterScanPlugin } from "./esbuild-plugin-astro-frontmatter.js";
 import { getParts } from "./utils/generate-routes-json.js";
+import { buildAssetsHeadersContent } from "./utils/headers.js";
 import {
   normalizeImageServiceConfig,
   setImageConfig
@@ -101,6 +105,7 @@ function createIntegration({
         const needsImagesBindingForDev = isCompile && command === "dev";
         const usesContentCollections = hasContentCollectionsConfig(config.srcDir);
         const prebundleContentRuntime = command === "dev" && usesContentCollections;
+        const isTypeGenPhase = command === "build" || command === "sync";
         const adapterPluginConfig = {
           config: cloudflareConfigCustomizer({
             needsSessionKVBinding,
@@ -138,6 +143,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
@@ -146,11 +161,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",
@@ -166,6 +177,9 @@ function createIntegration({
               {
                 name: "@astrojs/cloudflare:environment",
                 configEnvironment(environmentName, _options) {
+                  if (isTypeGenPhase) {
+                    return { optimizeDeps: { noDiscovery: true, include: [] } };
+                  }
                   const isServerEnvironment = ["astro", "ssr", "prerender"].includes(
                     environmentName
                   );
@@ -356,7 +370,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),
@@ -378,6 +392,39 @@ function createIntegration({
           } catch {
           }
         }
+        if (_config.build.assetsPrefix) {
+          logger.debug(
+            "Skipping Cache-Control injection for assets \u2014 `build.assetsPrefix` is set, so assets are served from a different origin."
+          );
+        } else {
+          const headersPath = new URL("./_headers", _originalClientDir);
+          const result = await buildAssetsHeadersContent(
+            {
+              assetsDir: _config.build.assets,
+              basePrefix: removeTrailingForwardSlash(_config.base),
+              headersPath
+            },
+            (path) => readFile(path, "utf-8")
+          );
+          if (result === null) {
+            logger.debug(
+              `Skipping Cache-Control injection \u2014 _headers already sets Cache-Control on a matching rule.`
+            );
+          } else {
+            const tempPath = new URL("./_headers.tmp", _originalClientDir);
+            try {
+              await writeFile(tempPath, result.content);
+              await rename(tempPath, headersPath);
+            } catch (err) {
+              await unlink(tempPath).catch(() => {
+              });
+              throw err;
+            }
+            logger.info(
+              `Injected immutable Cache-Control for ${result.assetsPattern} into _headers.`
+            );
+          }
+        }
         let redirectsExists = false;
         try {
           const redirectsStat = await stat(new URL("./_redirects", _originalClientDir));

package/dist/utils/headers.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Returns true if the given `_headers` content already declares (or detaches)
+ * a `Cache-Control` directive on any rule whose URL pattern matches `path`.
+ *
+ * Used to avoid emitting a second `Cache-Control` rule for hashed assets when
+ * the user already has one — Cloudflare merges duplicate header values across
+ * matching rules with a comma, which produces contradictory cache directives.
+ */
+export declare function headersFileHasCacheControlForPath(content: string, path: string): boolean;
+/**
+ * Computes the content to write to `_headers` to inject an immutable
+ * Cache-Control rule for the hashed assets directory.
+ *
+ * Returns `null` when injection should be skipped because the existing
+ * `_headers` already declares `Cache-Control` on a rule matching the assets
+ * path — Cloudflare merges duplicate header values with a comma, which would
+ * produce contradictory directives.
+ */
+export declare function buildAssetsHeadersContent(opts: {
+    assetsDir: string;
+    basePrefix: string;
+    headersPath: URL;
+}, readFile: (path: URL) => Promise<string>): Promise<{
+    content: string;
+    assetsPattern: string;
+} | null>;

package/dist/utils/headers.js

@@ -0,0 +1,63 @@
+function cfHeadersPatternToRegex(pattern) {
+  let regexStr = "";
+  let i = 0;
+  while (i < pattern.length) {
+    const ch = pattern[i];
+    if (ch === "*") {
+      regexStr += ".*";
+      i++;
+    } else if (ch === ":" && /[A-Za-z]/.test(pattern[i + 1] ?? "")) {
+      i++;
+      while (i < pattern.length && /\w/.test(pattern[i])) i++;
+      regexStr += "[^/]+";
+    } else {
+      regexStr += ch.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+      i++;
+    }
+  }
+  return new RegExp(`^${regexStr}$`);
+}
+function headersFileHasCacheControlForPath(content, path) {
+  let matchesCurrentSection = false;
+  for (const rawLine of content.split("\n")) {
+    const trimmed = rawLine.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const isSectionHeader = !/^\s/.test(rawLine);
+    if (isSectionHeader) {
+      const pathOnly = trimmed.replace(/^https?:\/\/[^/]+/, "");
+      try {
+        matchesCurrentSection = cfHeadersPatternToRegex(pathOnly).test(path);
+      } catch {
+        matchesCurrentSection = false;
+      }
+    } else if (matchesCurrentSection && // Either `Cache-Control: value` (set) or `! Cache-Control` (detach).
+    /^\s+(?:!\s+cache-control\s*$|cache-control\s*:)/i.test(rawLine)) {
+      return true;
+    }
+  }
+  return false;
+}
+async function buildAssetsHeadersContent(opts, readFile) {
+  const { assetsDir, basePrefix, headersPath } = opts;
+  const assetsPattern = `${basePrefix}/${assetsDir}/*`;
+  const probePath = `${basePrefix}/${assetsDir}/probe`;
+  let existingHeaders = "";
+  try {
+    existingHeaders = await readFile(headersPath);
+  } catch {
+  }
+  if (headersFileHasCacheControlForPath(existingHeaders, probePath)) {
+    return null;
+  }
+  const cacheBlock = `${assetsPattern}
+  Cache-Control: public, max-age=31536000, immutable
+`;
+  const normalizedExisting = existingHeaders && !existingHeaders.endsWith("\n") ? existingHeaders + "\n" : existingHeaders;
+  const content = normalizedExisting ? `${cacheBlock}
+${normalizedExisting}` : cacheBlock;
+  return { content, assetsPattern };
+}
+export {
+  buildAssetsHeadersContent,
+  headersFileHasCacheControlForPath
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers",
-  "version": "14.0.0-alpha.1",
+  "version": "14.0.0-beta.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -55,7 +55,7 @@
     "cheerio": "1.2.0",
     "devalue": "^5.8.1",
     "prismjs": "^1.30.0",
-    "astro": "7.0.0-alpha.2",
+    "astro": "7.0.0-beta.6",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {