@astrojs/cloudflare 13.2.2 → 13.3.1

package/dist/entrypoints/preview.js

@@ -14,6 +14,7 @@ const createPreviewServer = async ({
   headers,
   port,
   host,
+  allowedHosts,
   root
 }) => {
   const wranglerConfigPath = resolvePath(fileURLToPath(root), ".wrangler/deploy/config.json");
@@ -37,7 +38,7 @@ const createPreviewServer = async ({
         port,
         headers,
         open: false,
-        allowedHosts: []
+        allowedHosts
       },
       plugins: [
         cfVitePlugin({ ...globalThis.astroCloudflareOptions, viteEnvironment: { name: "ssr" } })
@@ -87,7 +88,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.2.2";
+  const version = "13.3.1";
   const localPrefix = `${colors.dim("\u2503")} Local    `;
   const networkPrefix = `${colors.dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);

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

@@ -1,5 +1,12 @@
 import { readFile } from "node:fs/promises";
 const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---/;
+const RETURN_REPLACE_RE = /(\/\/[^\n]*|\/\*[\s\S]*?\*\/|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')|(?<!\.)\breturn(\s*;|\b)/g;
+function replaceTopLevelReturns(code) {
+  return code.replace(RETURN_REPLACE_RE, (_match, skip, tail) => {
+    if (skip !== void 0) return skip;
+    return tail.trim() === ";" ? "throw 0;" : "throw ";
+  });
+}
 function astroFrontmatterScanPlugin() {
   return {
     name: "astro-frontmatter-scan",
@@ -9,7 +16,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\s*;/g, "throw 0;").replace(/\breturn\b/g, "throw ");
+            const contents = replaceTopLevelReturns(frontmatterMatch[1]);
             return {
               contents: contents + "\nexport default {}",
               loader: "ts"

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createReadStream, existsSync, readFileSync } from "node:fs";
-import { appendFile, stat } from "node:fs/promises";
+import { appendFile, rename, stat } from "node:fs/promises";
 import { createInterface } from "node:readline/promises";
 import { removeLeadingForwardSlash } from "@astrojs/internal-helpers/path";
 import { createRedirectsFromAstroRoutes, printAsRedirects } from "@astrojs/underscore-redirects";
@@ -57,6 +57,7 @@ function createIntegration({
   ...cloudflareOptions
 } = {}) {
   let _config;
+  let _originalClientDir;
   let _routes;
   let _isFullyStatic = false;
   let cfPluginConfig;
@@ -256,6 +257,10 @@ function createIntegration({
       },
       "astro:config:done": ({ setAdapter, config, injectTypes, logger }) => {
         _config = config;
+        _originalClientDir = new URL(config.build.client.href);
+        if (config.base !== "/") {
+          config.build.client = new URL("." + config.base + "/", config.build.client);
+        }
         injectTypes({
           filename: "cloudflare.d.ts",
           content: '/// <reference types="@astrojs/cloudflare/types.d.ts" />'
@@ -330,9 +335,20 @@ function createIntegration({
         }
       },
       "astro:build:done": async ({ dir, logger, assets }) => {
+        if (_config.base !== "/") {
+          for (const file of [".assetsignore", "_headers"]) {
+            try {
+              await rename(
+                new URL(`./${file}`, _config.build.client),
+                new URL(`./${file}`, _originalClientDir)
+              );
+            } catch {
+            }
+          }
+        }
         let redirectsExists = false;
         try {
-          const redirectsStat = await stat(new URL("./_redirects", _config.build.client));
+          const redirectsStat = await stat(new URL("./_redirects", _originalClientDir));
           if (redirectsStat.isFile()) {
             redirectsExists = true;
           }
@@ -342,7 +358,7 @@ function createIntegration({
         const redirects = [];
         if (redirectsExists) {
           const rl = createInterface({
-            input: createReadStream(new URL("./_redirects", _config.build.client)),
+            input: createReadStream(new URL("./_redirects", _originalClientDir)),
             crlfDelay: Number.POSITIVE_INFINITY
           });
           for await (const line of rl) {
@@ -370,7 +386,7 @@ function createIntegration({
         if (!trueRedirects.empty()) {
           try {
             await appendFile(
-              new URL("./_redirects", _config.build.client),
+              new URL("./_redirects", _originalClientDir),
               printAsRedirects(trueRedirects)
             );
           } catch (_error) {

package/dist/utils/handler.js

@@ -89,9 +89,11 @@ async function handle(request, env, 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$/, ""));
     },

package/dist/wrangler.js

@@ -2,6 +2,11 @@ const DEFAULT_SESSION_KV_BINDING_NAME = "SESSION";
 const DEFAULT_IMAGES_BINDING_NAME = "IMAGES";
 const DEFAULT_ASSETS_BINDING_NAME = "ASSETS";
 const DEFAULT_COMPATIBILITY_DATE = "2026-04-15";
+function withSessionKVBinding(existing, sessionBinding) {
+  const namespaces = existing ? [...existing] : [];
+  namespaces.push({ binding: sessionBinding });
+  return namespaces;
+}
 function cloudflareConfigCustomizer(options) {
   const sessionKVBindingName = options?.sessionKVBindingName ?? DEFAULT_SESSION_KV_BINDING_NAME;
   const needsSessionKVBinding = options?.needsSessionKVBinding ?? true;
@@ -13,11 +18,7 @@ function cloudflareConfigCustomizer(options) {
       );
       const hasImagesBinding = nonInheritableConfig?.images?.binding !== void 0;
       return {
-        kv_namespaces: !needsSessionKVBinding || hasSessionBinding ? void 0 : [
-          {
-            binding: sessionKVBindingName
-          }
-        ],
+        kv_namespaces: !needsSessionKVBinding || hasSessionBinding ? void 0 : withSessionKVBinding(nonInheritableConfig?.kv_namespaces, sessionKVBindingName),
         images: hasImagesBinding || !imagesBindingName ? void 0 : {
           binding: imagesBindingName
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers",
-  "version": "13.2.2",
+  "version": "13.3.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -51,7 +51,7 @@
     "@types/node": "^25.2.2",
     "cheerio": "1.2.0",
     "devalue": "^5.6.3",
-    "astro": "6.1.10",
+    "astro": "6.2.2",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {