@astrojs/cloudflare 6.6.1 → 6.7.0

package/README.md

@@ -106,7 +106,10 @@ Cloudflare has support for adding custom [headers](https://developers.cloudflare
 
 ### Custom `_routes.json`
 
-By default, `@astrojs/cloudflare` will generate a `_routes.json` file that lists all files from your `dist/` folder and redirects from the `_redirects` file in the `exclude` array. This will enable Cloudflare to serve files and process static redirects without a function invocation. Creating a custom `_routes.json` will override this automatic optimization and, if not configured manually, cause function invocations that will count against the request limits of your Cloudflare plan.
+By default, `@astrojs/cloudflare` will generate a `_routes.json` file with `include` and `exclude` rules based on your applications's dynamic and static routes.
+This will enable Cloudflare to serve files and process static redirects without a function invocation. Creating a custom `_routes.json` will override this automatic optimization and, if not configured manually, cause function invocations that will count against the request limits of your Cloudflare plan.
+
+See [Cloudflare's documentation](https://developers.cloudflare.com/pages/platform/functions/routing/#create-a-_routesjson-file) for more details.
 
 ## Troubleshooting
 

package/dist/index.js

@@ -1,10 +1,10 @@
 import { createRedirectsFromAstroRoutes } from "@astrojs/underscore-redirects";
 import esbuild from "esbuild";
-import * as fs from "fs";
-import * as os from "os";
-import { dirname } from "path";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import glob from "tiny-glob";
-import { fileURLToPath, pathToFileURL } from "url";
 function getAdapter(isModeDirectory) {
   return isModeDirectory ? {
     name: "@astrojs/cloudflare",
@@ -21,6 +21,7 @@ const SHIM = `globalThis.process = {
 	env: {},
 };`;
 const SERVER_BUILD_FOLDER = "/$server_build/";
+const potentialFunctionRouteTypes = ["endpoint", "page"];
 function createIntegration(args) {
   let _config;
   let _buildConfig;
@@ -68,6 +69,10 @@ function createIntegration(args) {
           }
           vite.ssr ||= {};
           vite.ssr.target = "webworker";
+          vite.define = {
+            "process.env": "process.env",
+            ...vite.define
+          };
         }
       },
       "astro:build:ssr": ({ entryPoints }) => {
@@ -80,11 +85,11 @@ function createIntegration(args) {
           await fs.promises.mkdir(functionsUrl, { recursive: true });
         }
         if (isModeDirectory && _buildConfig.split) {
-          const entryPointsRouteData = [..._entryPoints.keys()];
           const entryPointsURL = [..._entryPoints.values()];
           const entryPaths = entryPointsURL.map((entry) => fileURLToPath(entry));
-          const outputDir = fileURLToPath(new URL(".astro", _buildConfig.server));
-          const { outputFiles } = await esbuild.build({
+          const outputUrl = new URL("$astro", _buildConfig.server);
+          const outputDir = fileURLToPath(outputUrl);
+          await esbuild.build({
             target: "es2020",
             platform: "browser",
             conditions: ["workerd", "worker", "browser"],
@@ -99,19 +104,31 @@ function createIntegration(args) {
             },
             logOverride: {
               "ignored-bare-import": "silent"
-            },
-            write: false
+            }
+          });
+          const outputFiles = await glob(`**/*`, {
+            cwd: outputDir,
+            filesOnly: true
           });
-          for (const [index, outputFile] of outputFiles.entries()) {
-            const fileName = entryPointsRouteData[index].component.replace("src/pages/", "").replace(".astro", ".js").replace(/(\[\.\.\.)(\w+)(\])/g, (_match, _p1, p2) => {
-              return `[[${p2}]]`;
+          for (const outputFile of outputFiles) {
+            const path = outputFile.split(sep);
+            const finalSegments = path.map(
+              (segment) => segment.replace(/(\_)(\w+)(\_)/g, (_, __, prop) => {
+                return `[${prop}]`;
+              }).replace(/(\_\-\-\-)(\w+)(\_)/g, (_, __, prop) => {
+                return `[[${prop}]]`;
+              })
+            );
+            finalSegments[finalSegments.length - 1] = finalSegments[finalSegments.length - 1].replace("entry.", "").replace(/(.*)\.(\w+)\.(\w+)$/g, (_, fileName, __, newExt) => {
+              return `${fileName}.${newExt}`;
             });
-            const fileUrl = new URL(fileName, functionsUrl);
-            const newFileDir = dirname(fileURLToPath(fileUrl));
-            if (!fs.existsSync(newFileDir)) {
-              fs.mkdirSync(newFileDir, { recursive: true });
-            }
-            await fs.promises.writeFile(fileUrl, outputFile.contents);
+            const finalDirPath = finalSegments.slice(0, -1).join(sep);
+            const finalPath = finalSegments.join(sep);
+            const newDirUrl = new URL(finalDirPath, functionsUrl);
+            await fs.promises.mkdir(newDirUrl, { recursive: true });
+            const oldFileUrl = new URL(`$astro/${outputFile}`, outputUrl);
+            const newFileUrl = new URL(finalPath, functionsUrl);
+            await fs.promises.rename(oldFileUrl, newFileUrl);
           }
         } else {
           const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
@@ -157,10 +174,20 @@ function createIntegration(args) {
         }
         const routesExists = await fs.promises.stat(new URL("./_routes.json", _config.outDir)).then((stat) => stat.isFile()).catch(() => false);
         if (!routesExists) {
+          const functionEndpoints = routes.filter((route) => potentialFunctionRouteTypes.includes(route.type) && !route.prerender).map((route) => {
+            const includePattern = "/" + route.segments.flat().map((segment) => segment.dynamic ? "*" : segment.content).join("/");
+            const regexp = new RegExp(
+              "^\\/" + route.segments.flat().map((segment) => segment.dynamic ? "(.*)" : segment.content).join("\\/") + "$"
+            );
+            return {
+              includePattern,
+              regexp
+            };
+          });
           const staticPathList = (await glob(`${fileURLToPath(_buildConfig.client)}/**/*`, {
             cwd: fileURLToPath(_config.outDir),
             filesOnly: true
-          })).filter((file) => cloudflareSpecialFiles.indexOf(file) < 0).map((file) => `/${file}`);
+          })).filter((file) => cloudflareSpecialFiles.indexOf(file) < 0).map((file) => `/${file.replace(/\\/g, "/")}`);
           for (let page of pages) {
             let pagePath = prependForwardSlash(page.pathname);
             if (_config.base !== "/") {
@@ -199,13 +226,30 @@ function createIntegration(args) {
               trueRedirects.print()
             );
           }
+          staticPathList.push(...routes.filter((r) => r.type === "redirect").map((r) => r.route));
+          let include = deduplicatePatterns(
+            functionEndpoints.map((endpoint) => endpoint.includePattern)
+          );
+          let exclude = deduplicatePatterns(
+            staticPathList.filter(
+              (file) => functionEndpoints.some((endpoint) => endpoint.regexp.test(file))
+            )
+          );
+          if (include.length === 0) {
+            include = ["/"];
+            exclude = ["/"];
+          }
+          if (include.length + exclude.length > staticPathList.length) {
+            include = ["/*"];
+            exclude = deduplicatePatterns(staticPathList);
+          }
           await fs.promises.writeFile(
             new URL("./_routes.json", _config.outDir),
             JSON.stringify(
               {
                 version: 1,
-                include: ["/*"],
-                exclude: staticPathList
+                include,
+                exclude
               },
               null,
               2
@@ -219,6 +263,18 @@ function createIntegration(args) {
 function prependForwardSlash(path) {
   return path[0] === "/" ? path : "/" + path;
 }
+function deduplicatePatterns(patterns) {
+  const openPatterns = [];
+  return [...new Set(patterns)].sort((a, b) => a.length - b.length).filter((pattern) => {
+    if (openPatterns.some((p) => p.test(pattern))) {
+      return false;
+    }
+    if (pattern.endsWith("*")) {
+      openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, ".*")}`));
+    }
+    return true;
+  });
+}
 export {
   createIntegration as default,
   getAdapter

package/dist/server.advanced.d.ts

@@ -1,4 +1,4 @@
-import type { ExecutionContext, Request as CFRequest } from '@cloudflare/workers-types';
+import type { Request as CFRequest, ExecutionContext } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 type Env = {
     ASSETS: {

package/dist/server.directory.d.ts

@@ -1,10 +1,10 @@
-import type { EventContext, Request as CFRequest } from '@cloudflare/workers-types';
+import type { Request as CFRequest, EventContext } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 export declare function createExports(manifest: SSRManifest): {
     onRequest: ({ request, next, ...runtimeEnv }: {
         request: Request & CFRequest;
         next: (request: Request) => void;
         waitUntil: EventContext<unknown, any, unknown>['waitUntil'];
-    } & Record<string, unknown>) => Promise<void | Response>;
+    } & Record<string, unknown>) => Promise<import("@cloudflare/workers-types").Response | Response>;
     manifest: SSRManifest;
 };

package/dist/server.directory.js

@@ -13,7 +13,9 @@ function createExports(manifest) {
     process.env = runtimeEnv.env;
     const { pathname } = new URL(request.url);
     if (manifest.assets.has(pathname)) {
-      return next(request);
+      return runtimeEnv.env.ASSETS.fetch(
+        request
+      );
     }
     let routeData = app.match(request, { matchNotFound: true });
     if (routeData) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "6.6.1",
+  "version": "6.7.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -38,14 +38,14 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^2.8.2"
+    "astro": "^2.10.5"
   },
   "devDependencies": {
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
     "wrangler": "^2.0.23",
-    "astro": "2.8.2",
+    "astro": "2.10.5",
     "astro-scripts": "0.0.14"
   },
   "scripts": {