fix(cloudflare-pages): use predefined wildcards in routes.exclude (#…

…2319)
unjs · Apr 2, 2024 · 3cb566e · 3cb566e
1 parent 91ef6d0
commit 3cb566e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/presets/cloudflare-pages.ts b/src/presets/cloudflare-pages.ts
@@ -120,8 +120,8 @@ async function writeCFRoutes(nitro: Nitro) {
       "_worker.js",
       "_worker.js.map",
       "nitro.json",
-      ...explicitPublicAssets.map((dir) =>
-        withoutLeadingSlash(joinURL(dir.baseURL, "**"))
+      ...routes.exclude.map((path) =>
+        withoutLeadingSlash(path.replace(/\/\*$/, "/**"))
       ),
     ],
   });

diff --git a/test/fixture/nitro.config.ts b/test/fixture/nitro.config.ts
@@ -107,7 +107,7 @@ export default defineNitroConfig({
     pages: {
       routes: {
         include: ["/*"],
-        exclude: ["/blog/static/*"],
+        exclude: ["/blog/static/*", "/cf-pages-exclude/*"],
       },
     },
   },

diff --git a/test/fixture/public/cf-pages-exclude/not-in-routes-json.txt b/test/fixture/public/cf-pages-exclude/not-in-routes-json.txt
@@ -0,0 +1,2 @@
+This file shouldn't be under "exclude" in the _routes.json outputted by Cloudflare Pages builds.
+It's covered by the "/cf-pages-exclude/*" wildcard.
diff --git a/test/presets/cloudflare-pages.test.ts b/test/presets/cloudflare-pages.test.ts
@@ -39,6 +39,7 @@ describe.skipIf(isWindows)("nitro:preset:cloudflare-pages", async () => {
       {
         "exclude": [
           "/blog/static/*",
+          "/cf-pages-exclude/*",
           "/build/*",
           "/_unignored.txt",
           "/favicon.ico",