@astrojs/cloudflare 13.5.0 → 13.5.2

package/dist/entrypoints/preview.js

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

package/dist/esbuild-plugin-astro-frontmatter.d.ts

@@ -4,6 +4,12 @@ type ESBuildPlugin = NonNullable<NonNullable<DepOptimizationConfig['esbuildOptio
  * An esbuild plugin that extracts frontmatter from .astro files during
  * dependency optimization scanning. This allows Vite to discover imports
  * in the server-side frontmatter code.
+ *
+ * This plugin uses an `onResolve` handler to intercept `.astro` files before
+ * Vite's built-in `vite:dep-scan` plugin routes them to the `html` namespace.
+ * Without this, Vite's scanner only extracts `<script>` tags from `.astro`
+ * files, completely missing frontmatter imports (which is where SSR-side
+ * dependencies like `zod`, `nanostores`, `astro:transitions`, etc. live).
  */
 export declare function astroFrontmatterScanPlugin(): ESBuildPlugin;
 export {};

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

@@ -1,4 +1,5 @@
 import { readFile } from "node:fs/promises";
+import { dirname, isAbsolute, resolve } from "node:path";
 const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---/;
 const RETURN_REPLACE_RE = /(\/\/[^\n]*|\/\*[\s\S]*?\*\/|`(?:[^`\\]|\\.)*`|"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')|(?<!\.)\breturn(\s*;|\b)/g;
 function replaceTopLevelReturns(code) {
@@ -7,11 +8,19 @@ function replaceTopLevelReturns(code) {
     return tail.trim() === ";" ? "throw 0;" : "throw ";
   });
 }
+const ASTRO_FRONTMATTER_NAMESPACE = "astro-frontmatter";
 function astroFrontmatterScanPlugin() {
   return {
     name: "astro-frontmatter-scan",
     setup(build) {
-      build.onLoad({ filter: /\.astro$/ }, async (args) => {
+      build.onResolve({ filter: /\.astro$/ }, (args) => {
+        if (args.namespace !== "file" && args.namespace !== "" && args.namespace !== void 0) {
+          return void 0;
+        }
+        const resolvedPath = isAbsolute(args.path) ? args.path : resolve(args.resolveDir, args.path);
+        return { path: resolvedPath, namespace: ASTRO_FRONTMATTER_NAMESPACE };
+      });
+      build.onLoad({ filter: /\.astro$/, namespace: ASTRO_FRONTMATTER_NAMESPACE }, async (args) => {
         try {
           const code = await readFile(args.path, "utf-8");
           const frontmatterMatch = FRONTMATTER_RE.exec(code);
@@ -19,14 +28,16 @@ function astroFrontmatterScanPlugin() {
             const contents = replaceTopLevelReturns(frontmatterMatch[1]);
             return {
               contents: contents + "\nexport default {}",
-              loader: "ts"
+              loader: "ts",
+              resolveDir: dirname(args.path)
             };
           }
         } catch {
         }
         return {
           contents: "export default {}",
-          loader: "ts"
+          loader: "ts",
+          resolveDir: dirname(args.path)
         };
       });
     }

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createReadStream, existsSync, readFileSync } from "node:fs";
-import { appendFile, rename, stat } from "node:fs/promises";
+import { appendFile, readFile, 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";
@@ -20,6 +20,7 @@ import {
 import { parseEnv } from "node:util";
 import { sessionDrivers } from "astro/config";
 import { createCloudflarePrerenderer } from "./prerenderer.js";
+import cfPrismPlugin from "./vite-plugin-prism.js";
 const CLOUDFLARE_KV_SESSION_DRIVER_ENTRYPOINT = sessionDrivers.cloudflareKVBinding().entrypoint;
 function usesCloudflareKVSessionDriver(session) {
   const driver = session?.driver;
@@ -66,7 +67,7 @@ function createIntegration({
   return {
     name: "@astrojs/cloudflare",
     hooks: {
-      "astro:config:setup": ({ command, config, updateConfig, logger, addWatchFile }) => {
+      "astro:config:setup": async ({ command, config, updateConfig, logger, addWatchFile }) => {
         if (!!process.versions.webcontainer) {
           throw new Error("`workerd` does not run on Stackblitz.");
         }
@@ -126,6 +127,12 @@ function createIntegration({
         if (command === "preview") {
           globalThis.astroCloudflareOptions = cfPluginConfig;
         }
+        const prismFiles = [
+          "@astrojs/prism > prismjs",
+          "@astrojs/prism > prismjs/components.js",
+          "@astrojs/prism > prismjs/dependencies.js"
+        ];
+        const isAstroPrismPackageInstalled = await getIsAstroPrismInstalled(config.root);
         updateConfig({
           build: {
             redirects: false
@@ -187,7 +194,13 @@ function createIntegration({
                           "astro/compiler-runtime",
                           "astro/jsx-runtime",
                           "astro/app/entrypoint/dev",
-                          "astro/virtual-modules/middleware.js"
+                          "astro/virtual-modules/middleware.js",
+                          "astro/virtual-modules/transitions.js",
+                          "astro/virtual-modules/transitions-router.js",
+                          "astro/virtual-modules/transitions-types.js",
+                          "astro/virtual-modules/transitions-events.js",
+                          "astro/virtual-modules/transitions-swap-functions.js",
+                          ...isAstroPrismPackageInstalled ? prismFiles : []
                         ],
                         exclude: [
                           "unstorage/drivers/cloudflare-kv-binding",
@@ -197,6 +210,7 @@ function createIntegration({
                           "virtual:@astrojs/*",
                           "@astrojs/starlight"
                         ],
+                        ignoreOutdatedRequests: true,
                         esbuildOptions: {
                           // Suppress Vite's `createRequire(import.meta.url)` banner to work around
                           // https://github.com/vitejs/vite/issues/22004 — Vite's SSR transform
@@ -239,7 +253,8 @@ function createIntegration({
                   imageServiceEntrypoint: "@astrojs/cloudflare/image-service-workerd",
                   buildAssets: config.build.assets ?? "_astro"
                 } : null
-              })
+              }),
+              cfPrismPlugin()
             ]
           },
           image: setImageConfig(imageService, config.image, command, logger)
@@ -306,6 +321,7 @@ function createIntegration({
         if (prerenderEnvironment === "workerd") {
           setPrerenderer(
             createCloudflarePrerenderer({
+              cloudflareOptions,
               root: _config.root,
               serverDir: _config.build.server,
               clientDir: _config.build.client,
@@ -399,6 +415,16 @@ function createIntegration({
     }
   };
 }
+async function getIsAstroPrismInstalled(rootURL) {
+  try {
+    const pkgURL = new URL("./package.json", rootURL);
+    const input = await readFile(pkgURL, { encoding: "utf-8" });
+    const pkgJson = JSON.parse(input);
+    return Object.hasOwn(pkgJson["dependencies"], "@astrojs/prism");
+  } catch {
+    return false;
+  }
+}
 export {
   createIntegration as default
 };

package/dist/prerenderer.d.ts

@@ -1,6 +1,7 @@
 import type { AstroConfig, AstroPrerenderer } from 'astro';
 import { type PluginConfig } from '@cloudflare/vite-plugin';
 interface CloudflarePrerendererOptions {
+    cloudflareOptions: Partial<PluginConfig>;
     root: AstroConfig['root'];
     serverDir: AstroConfig['build']['server'];
     clientDir: AstroConfig['build']['client'];
@@ -13,5 +14,5 @@ interface CloudflarePrerendererOptions {
  * Creates a prerenderer that uses Cloudflare's workerd runtime via a preview server.
  * This allows prerendering to happen in the same runtime that will serve the pages.
  */
-export declare function createCloudflarePrerenderer({ root, serverDir, clientDir, base, trailingSlash, cfPluginConfig, hasCompileImageService, }: CloudflarePrerendererOptions): AstroPrerenderer;
+export declare function createCloudflarePrerenderer({ cloudflareOptions, root, serverDir, clientDir, base, trailingSlash, cfPluginConfig, hasCompileImageService, }: CloudflarePrerendererOptions): AstroPrerenderer;
 export {};

package/dist/prerenderer.js

@@ -9,6 +9,7 @@ import {
   STATIC_IMAGES_ENDPOINT
 } from "./utils/prerender-constants.js";
 function createCloudflarePrerenderer({
+  cloudflareOptions,
   root,
   serverDir,
   clientDir,
@@ -48,7 +49,13 @@ function createCloudflarePrerenderer({
           // Let the OS pick a free port
           open: false
         },
-        plugins: [cfVitePlugin({ ...cfPluginConfig, viteEnvironment: { name: "prerender" } })]
+        plugins: [
+          cfVitePlugin({
+            ...cloudflareOptions,
+            ...cfPluginConfig,
+            viteEnvironment: { name: "prerender" }
+          })
+        ]
       });
       const address = previewServer.httpServer.address();
       if (address && typeof address === "object") {

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

@@ -0,0 +1,2 @@
+import type { Plugin } from 'vite';
+export default function cfPrismPlugin(): Plugin;

package/dist/vite-plugin-prism.js

@@ -0,0 +1,56 @@
+import { fileURLToPath } from "node:url";
+import components from "prismjs/components.js";
+const MODULE_ID = "virtual:astro-cloudflare:prism";
+const RESOLVED_MODULE_ID = "\0" + MODULE_ID;
+const languages = Object.keys(components.languages).filter((l) => l !== "meta");
+function cfPrismPlugin() {
+  return {
+    name: "@astrojs/cloudflare:prism",
+    configEnvironment(environmentName) {
+      if (environmentName === "ssr") {
+        return {
+          // Because this virtual module adds a large number of dynamic import statements,
+          // Vite’s logs will consequently display the message “new dependencies optimized” for all languages.
+          // To avoid this, we explicitly specify that the module should be optimized in advance.
+          optimizeDeps: {
+            include: ["prismjs/components/prism-*.js"]
+          }
+        };
+      }
+    },
+    resolveId: {
+      filter: {
+        id: new RegExp(`^${MODULE_ID}$`)
+      },
+      handler() {
+        return RESOLVED_MODULE_ID;
+      }
+    },
+    load: {
+      filter: {
+        id: new RegExp(`^${RESOLVED_MODULE_ID}$`)
+      },
+      async handler() {
+        const importerPath = fileURLToPath(import.meta.url);
+        const resolvedModules = await Promise.all(
+          languages.map(async (lang) => {
+            const resolvedId = await this.resolve(
+              `prismjs/components/prism-${lang}.js`,
+              importerPath
+            );
+            return { resolvedId: resolvedId?.id, lang };
+          })
+        );
+        const prismBundledLanguages = resolvedModules.filter(({ resolvedId }) => resolvedId !== void 0).map(
+          ({ resolvedId, lang }) => `${JSON.stringify(lang)}: () => import(${JSON.stringify(resolvedId)})`
+        );
+        return `
+					export const bundledLanguages = { ${prismBundledLanguages.join(",")} };
+				`;
+      }
+    }
+  };
+}
+export {
+  cfPrismPlugin as default
+};

package/dist/wrangler.js

@@ -2,11 +2,6 @@ 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;
@@ -18,7 +13,7 @@ function cloudflareConfigCustomizer(options) {
       );
       const hasImagesBinding = nonInheritableConfig?.images?.binding !== void 0;
       return {
-        kv_namespaces: !needsSessionKVBinding || hasSessionBinding ? void 0 : withSessionKVBinding(nonInheritableConfig?.kv_namespaces, sessionKVBindingName),
+        kv_namespaces: !needsSessionKVBinding || hasSessionBinding ? void 0 : [{ binding: 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.5.0",
+  "version": "13.5.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -39,7 +39,7 @@
     "piccolore": "^0.1.3",
     "tinyglobby": "^0.2.15",
     "vite": "^7.3.2",
-    "@astrojs/internal-helpers": "0.9.0",
+    "@astrojs/internal-helpers": "0.9.1",
     "@astrojs/underscore-redirects": "1.0.3"
   },
   "peerDependencies": {
@@ -49,9 +49,11 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260228.0",
     "@types/node": "^25.2.2",
+    "@types/prismjs": "1.26.6",
     "cheerio": "1.2.0",
     "devalue": "^5.6.3",
-    "astro": "6.3.0",
+    "prismjs": "^1.30.0",
+    "astro": "6.3.4",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {