@astrojs/cloudflare 11.0.4 → 11.1.0

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

@@ -1,11 +1,12 @@
 import { existsSync } from 'node:fs';
 import { writeFile } from 'node:fs/promises';
-import { posix } from 'node:path';
+import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { prependForwardSlash, removeLeadingForwardSlash, removeTrailingForwardSlash, } from '@astrojs/internal-helpers/path';
 import glob from 'tiny-glob';
 // Copied from https://github.com/withastro/astro/blob/3776ecf0aa9e08a992d3ae76e90682fd04093721/packages/astro/src/core/routing/manifest/create.ts#L45-L70
 // We're not sure how to improve this regex yet
+// eslint-disable-next-line regexp/no-super-linear-backtracking
 const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
 const ROUTE_SPREAD = /^\.{3}.+$/;
 export function getParts(part) {
@@ -95,6 +96,28 @@ class PathTrie {
             this.dfs(childNode, [...path, 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 === undefined) {
+                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);
@@ -128,7 +151,7 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
                 continue;
             const staticPath = staticFile;
             const segments = removeLeadingForwardSlash(staticPath)
-                .split(posix.sep)
+                .split(path.sep)
                 .filter(Boolean)
                 .map((s) => {
                 return getParts(s);
@@ -169,7 +192,7 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
         if (page.pathname === '404')
             hasPrerendered404 = true;
         const pageSegments = removeLeadingForwardSlash(page.pathname)
-            .split(posix.sep)
+            .split(path.posix.sep)
             .filter(Boolean)
             .map((s) => {
             return getParts(s);
@@ -180,7 +203,6 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
     for (const includePath of includePaths) {
         includeTrie.insert(includePath);
     }
-    const [deduplicatedIncludePaths, includedPathsHaveWildcard] = includeTrie.getAllPaths();
     const excludeTrie = new PathTrie();
     for (const excludePath of excludePaths) {
         /**
@@ -192,7 +214,12 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
             continue;
         excludeTrie.insert(excludePath);
     }
-    const [deduplicatedExcludePaths, _excludedPathsHaveWildcard] = excludeTrie.getAllPaths();
+    const [deduplicatedIncludePaths, includedPathsHaveWildcard] = includeTrie
+        .reduceAllPaths(excludeTrie)
+        .getAllPaths();
+    const [deduplicatedExcludePaths, _excludedPathsHaveWildcard] = excludeTrie
+        .reduceAllPaths(includeTrie)
+        .getAllPaths();
     /**
      * Cloudflare allows no more than 100 include/exclude rules combined
      * https://developers.cloudflare.com/pages/functions/routing/#limits

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

@@ -1,5 +1,5 @@
-import type { AstroConfig, AstroIntegrationLogger } from 'astro';
-export declare function setImageConfig(service: string, config: AstroConfig['image'], command: 'dev' | 'build' | 'preview', logger: AstroIntegrationLogger): {
+import type { AstroConfig, AstroIntegrationLogger, HookParameters } from 'astro';
+export declare function setImageConfig(service: string, config: AstroConfig['image'], command: HookParameters<'astro:config:setup'>['command'], logger: AstroIntegrationLogger): {
     service: import("astro").ImageServiceConfig<Record<string, any>>;
     domains: string[];
     remotePatterns: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "11.0.4",
+  "version": "11.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -31,26 +31,26 @@
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
     "@astrojs/underscore-redirects": "^0.3.4",
-    "@cloudflare/workers-types": "^4.20240620.0",
-    "esbuild": "^0.22.0",
+    "@cloudflare/workers-types": "^4.20240909.0",
+    "esbuild": "^0.21.5",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.10",
-    "miniflare": "^3.20240620.0",
+    "magic-string": "^0.30.11",
+    "miniflare": "^3.20240909.2",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.62.0",
-    "@inox-tools/astro-when": "^0.2.1"
+    "wrangler": "^3.78.3",
+    "@inox-tools/astro-when": "^0.2.3"
   },
   "peerDependencies": {
     "astro": "^4.10.3"
   },
   "devDependencies": {
-    "astro": "^4.11.3",
-    "cheerio": "1.0.0-rc.12",
+    "astro": "^4.15.6",
+    "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.18.0",
+    "rollup": "^4.21.3",
     "strip-ansi": "^7.1.0",
-    "vite": "^5.3.2",
+    "vite": "^5.4.6",
     "astro-scripts": "0.0.14",
     "@astrojs/test-utils": "0.0.1"
   },