@astrojs/cloudflare 13.0.0-beta.7 → 13.0.0-beta.8

package/dist/entrypoints/preview.js

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

package/dist/index.d.ts

@@ -4,30 +4,6 @@ export type { Runtime } from './utils/handler.js';
 export type Options = {
     /** Options for handling images. */
     imageService?: ImageService;
-    /** Configuration for `_routes.json` generation. A _routes.json file controls when your Function is invoked. This file will include three different properties:
-     *
-     * - version: Defines the version of the schema. Currently there is only one version of the schema (version 1), however, we may add more in the future and aim to be backwards compatible.
-     * - include: Defines routes that will be invoked by Functions. Accepts wildcard behavior.
-     * - exclude: Defines routes that will not be invoked by Functions. Accepts wildcard behavior. `exclude` always take priority over `include`.
-     *
-     * Wildcards match any number of path segments (slashes). For example, `/users/*` will match everything after the `/users/` path.
-     *
-     */
-    routes?: {
-        /** Extend `_routes.json` */
-        extend: {
-            /** Paths which should be routed to the SSR function */
-            include?: {
-                /** Generally this is in pathname format, but does support wildcards, e.g. `/users`, `/products/*` */
-                pattern: string;
-            }[];
-            /** Paths which should be routed as static assets */
-            exclude?: {
-                /** Generally this is in pathname format, but does support wildcards, e.g. `/static`, `/assets/*`, `/images/avatar.jpg` */
-                pattern: string;
-            }[];
-        };
-    };
     /**
      * By default, Astro will be configured to use Cloudflare KV to store session data. The KV namespace
      * will be automatically provisioned when you deploy.

package/dist/index.js

@@ -1,11 +1,11 @@
 import { createReadStream, existsSync, readFileSync } from "node:fs";
-import { appendFile, stat } from "node:fs/promises";
+import { appendFile, rm, 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";
 import { cloudflare as cfVitePlugin } from "@cloudflare/vite-plugin";
 import { astroFrontmatterScanPlugin } from "./esbuild-plugin-astro-frontmatter.js";
-import { createRoutesFile, getParts } from "./utils/generate-routes-json.js";
+import { getParts } from "./utils/generate-routes-json.js";
 import { setImageConfig } from "./utils/image-config.js";
 import { createConfigPlugin } from "./vite-plugin-config.js";
 import {
@@ -18,8 +18,8 @@ import { sessionDrivers } from "astro/config";
 import { createCloudflarePrerenderer } from "./prerenderer.js";
 function createIntegration(args) {
   let _config;
-  let finalBuildOutput;
   let _routes;
+  let _isFullyStatic = false;
   const sessionKVBindingName = args?.sessionKVBindingName ?? DEFAULT_SESSION_KV_BINDING_NAME;
   const imagesBindingName = args?.imagesBindingName ?? DEFAULT_IMAGES_BINDING_NAME;
   return {
@@ -64,8 +64,6 @@ function createIntegration(args) {
         };
         updateConfig({
           build: {
-            client: new URL(`./client/`, config.outDir),
-            server: new URL("./_worker.js/", config.outDir),
             redirects: false
           },
           session,
@@ -162,10 +160,11 @@ function createIntegration(args) {
       },
       "astro:routes:resolved": ({ routes }) => {
         _routes = routes;
+        const nonInternalRoutes = routes.filter((route) => route.origin !== "internal");
+        _isFullyStatic = nonInternalRoutes.length > 0 && nonInternalRoutes.every((route) => route.isPrerendered);
       },
-      "astro:config:done": ({ setAdapter, config, buildOutput, injectTypes, logger }) => {
+      "astro:config:done": ({ setAdapter, config, injectTypes, logger }) => {
         _config = config;
-        finalBuildOutput = buildOutput;
         injectTypes({
           filename: "cloudflare.d.ts",
           content: '/// <reference types="@astrojs/cloudflare/types.d.ts" />'
@@ -176,12 +175,12 @@ function createIntegration(args) {
             edgeMiddleware: false,
             buildOutput: "server"
           },
-          entryType: "self",
+          entrypointResolution: "auto",
           previewEntrypoint: "@astrojs/cloudflare/entrypoints/preview",
           supportedAstroFeatures: {
             serverOutput: "stable",
             hybridOutput: "stable",
-            staticOutput: "unsupported",
+            staticOutput: "stable",
             i18nDomains: "experimental",
             sharpImageService: {
               support: "limited",
@@ -236,7 +235,7 @@ function createIntegration(args) {
           };
         }
       },
-      "astro:build:done": async ({ pages, dir, logger, assets }) => {
+      "astro:build:done": async ({ dir, logger, assets }) => {
         let redirectsExists = false;
         try {
           const redirectsStat = await stat(new URL("./_redirects", _config.build.client));
@@ -263,26 +262,6 @@ function createIntegration(args) {
             }
           }
         }
-        let routesExists = false;
-        try {
-          const routesStat = await stat(new URL("./_routes.json", _config.build.client));
-          if (routesStat.isFile()) {
-            routesExists = true;
-          }
-        } catch (_error) {
-          routesExists = false;
-        }
-        if (!routesExists) {
-          await createRoutesFile(
-            _config,
-            logger,
-            _routes,
-            pages,
-            redirects,
-            args?.routes?.extend?.include,
-            args?.routes?.extend?.exclude
-          );
-        }
         const trueRedirects = createRedirectsFromAstroRoutes({
           config: _config,
           routeToDynamicTargetMap: new Map(
@@ -291,7 +270,7 @@ function createIntegration(args) {
             )
           ),
           dir,
-          buildOutput: finalBuildOutput,
+          buildOutput: _isFullyStatic ? "static" : "server",
           assets
         });
         if (!trueRedirects.empty()) {
@@ -304,6 +283,9 @@ function createIntegration(args) {
             logger.error("Failed to write _redirects file");
           }
         }
+        if (_isFullyStatic) {
+          await rm(_config.build.server, { recursive: true, force: true });
+        }
         delete process.env.CLOUDFLARE_VITE_BUILD;
       }
     }

package/dist/utils/generate-routes-json.d.ts

@@ -1,9 +1,2 @@
-import type { AstroConfig, AstroIntegrationLogger, IntegrationResolvedRoute, RoutePart } from 'astro';
+import type { RoutePart } from 'astro';
 export declare function getParts(part: string): RoutePart[];
-export declare function createRoutesFile(_config: AstroConfig, logger: AstroIntegrationLogger, routes: IntegrationResolvedRoute[], pages: {
-    pathname: string;
-}[], redirects: IntegrationResolvedRoute['segments'][], includeExtends: {
-    pattern: string;
-}[] | undefined, excludeExtends: {
-    pattern: string;
-}[] | undefined): Promise<void>;

package/dist/utils/generate-routes-json.js

@@ -1,13 +1,3 @@
-import { existsSync } from "node:fs";
-import { writeFile } from "node:fs/promises";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import {
-  prependForwardSlash,
-  removeLeadingForwardSlash,
-  removeTrailingForwardSlash
-} from "@astrojs/internal-helpers/path";
-import { glob } from "tinyglobby";
 const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
 const ROUTE_SPREAD = /^\.{3}.+$/;
 function getParts(part) {
@@ -27,199 +17,6 @@ function getParts(part) {
   });
   return result;
 }
-async function writeRoutesFileToOutDir(_config, logger, include, exclude) {
-  try {
-    await writeFile(
-      new URL("./_routes.json", _config.outDir),
-      JSON.stringify(
-        {
-          version: 1,
-          include,
-          exclude
-        },
-        null,
-        2
-      ),
-      "utf-8"
-    );
-  } catch (_error) {
-    logger.error("There was an error writing the '_routes.json' file to the output directory.");
-  }
-}
-function segmentsToCfSyntax(segments, _config) {
-  const pathSegments = [];
-  if (removeLeadingForwardSlash(removeTrailingForwardSlash(_config.base)).length > 0) {
-    pathSegments.push(removeLeadingForwardSlash(removeTrailingForwardSlash(_config.base)));
-  }
-  for (const segment of segments.flat()) {
-    if (segment.dynamic) pathSegments.push("*");
-    else pathSegments.push(segment.content);
-  }
-  return pathSegments;
-}
-class TrieNode {
-  children = /* @__PURE__ */ new Map();
-  isEndOfPath = false;
-  hasWildcardChild = false;
-}
-class PathTrie {
-  root;
-  returnHasWildcard = false;
-  constructor() {
-    this.root = new TrieNode();
-  }
-  insert(thisPath) {
-    let node = this.root;
-    for (const segment of thisPath) {
-      if (segment === "*") {
-        node.hasWildcardChild = true;
-        break;
-      }
-      if (!node.children.has(segment)) {
-        node.children.set(segment, new TrieNode());
-      }
-      node = node.children.get(segment);
-    }
-    node.isEndOfPath = true;
-  }
-  /**
-   * Depth-first search (dfs), traverses the "graph"  segment by segment until the end or wildcard (*).
-   * It makes sure that all necessary paths are returned, but not paths with an existing wildcard prefix.
-   * e.g. if we have a path like /foo/* and /foo/bar, we only want to return /foo/*
-   */
-  dfs(node, thisPath, allPaths) {
-    if (node.hasWildcardChild) {
-      this.returnHasWildcard = true;
-      allPaths.push([...thisPath, "*"]);
-      return;
-    }
-    if (node.isEndOfPath) {
-      allPaths.push([...thisPath]);
-    }
-    for (const [segment, childNode] of node.children) {
-      this.dfs(childNode, [...thisPath, segment], allPaths);
-    }
-  }
-  /**
-   * The reduce function is used to remove unnecessary paths from the trie.
-   * It receives a trie node to compare with the current node.
-   */
-  reduce(compNode, node) {
-    if (node.hasWildcardChild || compNode.hasWildcardChild) return;
-    for (const [segment, childNode] of node.children) {
-      if (childNode.children.size === 0) continue;
-      const compChildNode = compNode.children.get(segment);
-      if (compChildNode === void 0) {
-        childNode.hasWildcardChild = true;
-        continue;
-      }
-      this.reduce(compChildNode, childNode);
-    }
-  }
-  reduceAllPaths(compTrie) {
-    this.reduce(compTrie.root, this.root);
-    return this;
-  }
-  getAllPaths() {
-    const allPaths = [];
-    this.dfs(this.root, [], allPaths);
-    return [allPaths, this.returnHasWildcard];
-  }
-}
-async function createRoutesFile(_config, logger, routes, pages, redirects, includeExtends, excludeExtends) {
-  const includePaths = [];
-  const excludePaths = [];
-  const assetsPath = segmentsToCfSyntax(
-    [
-      [{ content: _config.build.assets, dynamic: false, spread: false }],
-      [{ content: "", dynamic: true, spread: false }]
-    ],
-    _config
-  );
-  excludePaths.push(assetsPath);
-  for (const redirect of redirects) {
-    excludePaths.push(segmentsToCfSyntax(redirect, _config));
-  }
-  if (existsSync(fileURLToPath(_config.publicDir))) {
-    const staticFiles = await glob(`**/*`, {
-      cwd: fileURLToPath(_config.publicDir),
-      dot: true
-    });
-    for (const staticFile of staticFiles) {
-      if (["_headers", "_redirects", "_routes.json"].includes(staticFile)) continue;
-      const staticPath = staticFile;
-      const segments = removeLeadingForwardSlash(staticPath).split(path.sep).filter(Boolean).map((s) => {
-        return getParts(s);
-      });
-      excludePaths.push(segmentsToCfSyntax(segments, _config));
-    }
-  }
-  let hasPrerendered404 = false;
-  for (const route of routes) {
-    const convertedPath = segmentsToCfSyntax(route.segments, _config);
-    if (route.pathname === "/404" && route.isPrerendered === true) hasPrerendered404 = true;
-    switch (route.type) {
-      case "page":
-        if (route.isPrerendered === false) includePaths.push(convertedPath);
-        break;
-      case "endpoint":
-        if (route.isPrerendered === false) includePaths.push(convertedPath);
-        else excludePaths.push(convertedPath);
-        break;
-      case "redirect":
-        excludePaths.push(convertedPath);
-        break;
-      default:
-        includePaths.push(convertedPath);
-        break;
-    }
-  }
-  for (const page of pages) {
-    if (page.pathname === "404") hasPrerendered404 = true;
-    const pageSegments = removeLeadingForwardSlash(page.pathname).split(path.posix.sep).filter(Boolean).map((s) => {
-      return getParts(s);
-    });
-    excludePaths.push(segmentsToCfSyntax(pageSegments, _config));
-  }
-  const includeTrie = new PathTrie();
-  for (const includePath of includePaths) {
-    includeTrie.insert(includePath);
-  }
-  const excludeTrie = new PathTrie();
-  for (const excludePath of excludePaths) {
-    if (excludePath[0] === "*") continue;
-    excludeTrie.insert(excludePath);
-  }
-  const [deduplicatedIncludePaths, includedPathsHaveWildcard] = includeTrie.reduceAllPaths(excludeTrie).getAllPaths();
-  const [deduplicatedExcludePaths, _excludedPathsHaveWildcard] = excludeTrie.reduceAllPaths(includeTrie).getAllPaths();
-  const CLOUDFLARE_COMBINED_LIMIT = 100;
-  const AUTOMATIC_INCLUDE_RULES_COUNT = deduplicatedIncludePaths.length;
-  const EXTENDED_INCLUDE_RULES_COUNT = includeExtends?.length ?? 0;
-  const INCLUDE_RULES_COUNT = AUTOMATIC_INCLUDE_RULES_COUNT + EXTENDED_INCLUDE_RULES_COUNT;
-  const AUTOMATIC_EXCLUDE_RULES_COUNT = deduplicatedExcludePaths.length;
-  const EXTENDED_EXCLUDE_RULES_COUNT = excludeExtends?.length ?? 0;
-  const EXCLUDE_RULES_COUNT = AUTOMATIC_EXCLUDE_RULES_COUNT + EXTENDED_EXCLUDE_RULES_COUNT;
-  const OPTION2_TOTAL_COUNT = INCLUDE_RULES_COUNT + (includedPathsHaveWildcard ? EXCLUDE_RULES_COUNT : 0);
-  if (!hasPrerendered404 || OPTION2_TOTAL_COUNT > CLOUDFLARE_COMBINED_LIMIT) {
-    await writeRoutesFileToOutDir(
-      _config,
-      logger,
-      ["/*"].concat(includeExtends?.map((entry) => entry.pattern) ?? []),
-      deduplicatedExcludePaths.map((thisPath) => `${prependForwardSlash(thisPath.join("/"))}`).slice(
-        0,
-        CLOUDFLARE_COMBINED_LIMIT - EXTENDED_INCLUDE_RULES_COUNT - EXTENDED_EXCLUDE_RULES_COUNT - 1
-      ).concat(excludeExtends?.map((entry) => entry.pattern) ?? [])
-    );
-  } else {
-    await writeRoutesFileToOutDir(
-      _config,
-      logger,
-      deduplicatedIncludePaths.map((thisPath) => `${prependForwardSlash(thisPath.join("/"))}`).concat(includeExtends?.map((entry) => entry.pattern) ?? []),
-      includedPathsHaveWildcard ? deduplicatedExcludePaths.map((thisPath) => `${prependForwardSlash(thisPath.join("/"))}`).concat(excludeExtends?.map((entry) => entry.pattern) ?? []) : []
-    );
-  }
-}
 export {
-  createRoutesFile,
   getParts
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
-  "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "13.0.0-beta.7",
+  "description": "Deploy your site to Cloudflare Workers",
+  "version": "13.0.0-beta.8",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -35,7 +35,7 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@cloudflare/vite-plugin": "^1.23.0",
+    "@cloudflare/vite-plugin": "^1.25.0",
     "piccolore": "^0.1.3",
     "tinyglobby": "^0.2.15",
     "vite": "^7.3.1",
@@ -47,11 +47,11 @@
     "wrangler": "^4.61.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20260131.0",
+    "@cloudflare/workers-types": "^4.20260213.0",
     "@types/node": "^25.2.2",
     "cheerio": "1.2.0",
     "devalue": "^5.6.2",
-    "astro": "6.0.0-beta.11",
+    "astro": "6.0.0-beta.12",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {