@astrojs/cloudflare 7.0.0-beta.0 → 7.0.0-beta.1

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

@@ -41,6 +41,7 @@ const SHIM = `globalThis.process = {
 	env: {},
 };`;
 const SERVER_BUILD_FOLDER = "/$server_build/";
+const potentialFunctionRouteTypes = ["endpoint", "page"];
 function createIntegration(args) {
   let _config;
   let _buildConfig;
@@ -192,10 +193,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 !== "/") {
@@ -234,13 +245,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
@@ -254,6 +282,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0-beta.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -38,14 +38,14 @@
     "@astrojs/underscore-redirects": "0.3.0-beta.0"
   },
   "peerDependencies": {
-    "astro": "^3.0.0-beta.0"
+    "astro": "^3.0.0-beta.1"
   },
   "devDependencies": {
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
     "wrangler": "^2.0.23",
-    "astro": "3.0.0-beta.0",
+    "astro": "3.0.0-beta.1",
     "astro-scripts": "0.0.14"
   },
   "scripts": {