@astrojs/cloudflare 13.3.0 → 13.4.0

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

@@ -2,6 +2,7 @@ import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
 import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import { env } from "cloudflare:workers";
+import { fetchWithRedirects } from "astro/assets";
 const prerender = false;
 const GET = async ({ request }) => {
   try {
@@ -14,7 +15,10 @@ const GET = async ({ request }) => {
       if (!isRemoteAllowed(href, imageConfig)) {
         return new Response("Forbidden", { status: 403 });
       }
-      response = await fetch(href, { redirect: "manual" });
+      response = await fetchWithRedirects({
+        url: href,
+        imageConfig
+      });
     } else {
       const sourceUrl = new URL(href, url.origin);
       if (sourceUrl.origin !== url.origin) {

package/dist/entrypoints/preview.js

@@ -88,7 +88,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "13.3.0";
+  const version = "13.4.0";
   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;
@@ -177,6 +178,7 @@ function createIntegration({
                           "astro > piccolore",
                           "astro > picomatch",
                           "astro/app",
+                          "astro/app/fetch/default-handler",
                           "astro/assets",
                           "astro/assets/runtime",
                           "astro/assets/utils/inferRemoteSize.js",
@@ -256,6 +258,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 +336,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 +359,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 +387,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/image-binding-transform.js

@@ -1,6 +1,7 @@
 import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
 import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
+import { fetchWithRedirects } from "astro/assets";
 const qualityTable = {
   low: 25,
   mid: 50,
@@ -14,9 +15,21 @@ async function transform(rawUrl, images, assets) {
     return new Response("Forbidden", { status: 403 });
   }
   const imageSrc = new URL(href, url.origin);
-  const content = await (isRemotePath(href) ? fetch(imageSrc, { redirect: "manual" }) : assets.fetch(imageSrc));
-  if (content.status >= 300 && content.status < 400) {
-    return new Response("Not Found", { status: 404 });
+  let content;
+  if (isRemotePath(href)) {
+    try {
+      content = await fetchWithRedirects({
+        url: imageSrc,
+        imageConfig
+      });
+      if (!isRemoteAllowed(content.url, imageConfig)) {
+        return new Response("Forbidden", { status: 403 });
+      }
+    } catch {
+      return new Response("Not Found", { status: 404 });
+    }
+  } else {
+    content = await assets.fetch(imageSrc);
   }
   if (!content.body) {
     return new Response(null, { status: 404 });

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

@@ -16,6 +16,7 @@ export declare function setImageConfig(service: ImageServiceConfig | undefined,
     endpoint: {
         entrypoint: string;
     };
+    dangerouslyProcessSVG: boolean;
     domains: string[];
     remotePatterns: {
         protocol?: string | undefined;
@@ -34,6 +35,7 @@ export declare function setImageConfig(service: ImageServiceConfig | undefined,
         route: string;
         entrypoint?: string | undefined;
     };
+    dangerouslyProcessSVG: boolean;
     domains: string[];
     remotePatterns: {
         protocol?: string | undefined;

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.3.0",
+  "version": "13.4.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -39,8 +39,8 @@
     "piccolore": "^0.1.3",
     "tinyglobby": "^0.2.15",
     "vite": "^7.3.2",
-    "@astrojs/underscore-redirects": "1.0.3",
-    "@astrojs/internal-helpers": "0.9.0"
+    "@astrojs/internal-helpers": "0.9.0",
+    "@astrojs/underscore-redirects": "1.0.3"
   },
   "peerDependencies": {
     "astro": "^6.0.0",
@@ -51,7 +51,7 @@
     "@types/node": "^25.2.2",
     "cheerio": "1.2.0",
     "devalue": "^5.6.3",
-    "astro": "6.2.0",
+    "astro": "6.3.0",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {
@@ -59,9 +59,8 @@
   },
   "scripts": {
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "build": "astro-scripts build \"src/**/*.ts\" --clean-dts && tsc",
+    "build": "astro-scripts build \"src/**/*.ts\" --clean-dts && tsc -b",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "test": "astro-scripts test --force-exit \"test/**/*.test.ts\"",
-    "typecheck:tests": "tsc --build tsconfig.test.json"
+    "test": "astro-scripts test --force-exit \"test/**/*.test.ts\""
   }
 }