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

package/dist/index.js

@@ -50,6 +50,16 @@ export default function createIntegration(args) {
                             // https://developers.cloudflare.com/pages/functions/module-support/
                             // Allows imports of '.wasm', '.bin', and '.txt' file types
                             cloudflareModulePlugin,
+                            {
+                                name: 'vite:cf-imports',
+                                enforce: 'pre',
+                                resolveId(source) {
+                                    if (source.startsWith('cloudflare:')) {
+                                        return { id: source, external: true };
+                                    }
+                                    return null;
+                                },
+                            },
                         ],
                     },
                     integrations: [astroWhen()],

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

@@ -1,6 +1,6 @@
 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';
@@ -96,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);
@@ -129,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);
@@ -142,6 +164,7 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
         const convertedPath = segmentsToCfSyntax(route.segments, _config);
         if (route.pathname === '/404' && route.prerender === true)
             hasPrerendered404 = true;
+        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (route.type) {
             case 'page':
                 if (route.prerender === false)
@@ -170,7 +193,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);
@@ -181,7 +204,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) {
         /**
@@ -193,7 +215,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
@@ -211,9 +238,8 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
     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;
-    if (!hasPrerendered404 ||
-        INCLUDE_RULES_COUNT > CLOUDFLARE_COMBINED_LIMIT ||
-        EXCLUDE_RULES_COUNT > CLOUDFLARE_COMBINED_LIMIT) {
+    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((path) => `${prependForwardSlash(path.join('/'))}`)
             .slice(0, CLOUDFLARE_COMBINED_LIMIT -

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "12.0.0-beta.0",
+  "version": "12.0.0-beta.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -31,14 +31,14 @@
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
     "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
-    "@cloudflare/workers-types": "^4.20240903.0",
-    "esbuild": "^0.23.1",
+    "@cloudflare/workers-types": "^4.20241022.0",
+    "@inox-tools/astro-when": "^0.2.4",
+    "esbuild": "^0.24.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.11",
-    "miniflare": "^3.20240821.1",
+    "magic-string": "^0.30.12",
+    "miniflare": "^3.20241022.0",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.75.0",
-    "@inox-tools/astro-when": "^0.2.2"
+    "wrangler": "^3.84.0"
   },
   "peerDependencies": {
     "astro": "^5.0.0-alpha.8"
@@ -48,9 +48,9 @@
     "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.21.2",
+    "rollup": "^4.24.3",
     "strip-ansi": "^7.1.0",
-    "vite": "^5.4.3",
+    "vite": "6.0.0-beta.2",
     "@astrojs/test-utils": "0.0.1",
     "astro-scripts": "0.0.14"
   },