@astrojs/cloudflare 7.7.0 → 7.7.1

package/dist/entrypoints/server.advanced.js

@@ -14,31 +14,25 @@ export function createExports(manifest) {
         if (manifest.assets.has(pathname)) {
             return env.ASSETS.fetch(request);
         }
-        let routeData = app.match(request, { matchNotFound: true });
-        if (routeData) {
-            Reflect.set(request, Symbol.for('astro.clientAddress'), request.headers.get('cf-connecting-ip'));
-            const locals = {
-                runtime: {
-                    waitUntil: (promise) => {
-                        context.waitUntil(promise);
-                    },
-                    env: env,
-                    cf: request.cf,
-                    caches: caches,
+        let routeData = app.match(request);
+        Reflect.set(request, Symbol.for('astro.clientAddress'), request.headers.get('cf-connecting-ip'));
+        const locals = {
+            runtime: {
+                waitUntil: (promise) => {
+                    context.waitUntil(promise);
                 },
-            };
-            let response = await app.render(request, routeData, locals);
-            if (app.setCookieHeaders) {
-                for (const setCookieHeader of app.setCookieHeaders(response)) {
-                    response.headers.append('Set-Cookie', setCookieHeader);
-                }
+                env: env,
+                cf: request.cf,
+                caches: caches,
+            },
+        };
+        let response = await app.render(request, routeData, locals);
+        if (app.setCookieHeaders) {
+            for (const setCookieHeader of app.setCookieHeaders(response)) {
+                response.headers.append('Set-Cookie', setCookieHeader);
             }
-            return response;
         }
-        return new Response(null, {
-            status: 404,
-            statusText: 'Not found',
-        });
+        return response;
     };
     return { default: { fetch } };
 }

package/dist/entrypoints/server.directory.js

@@ -16,31 +16,25 @@ export function createExports(manifest) {
         if (manifest.assets.has(pathname)) {
             return env.ASSETS.fetch(request);
         }
-        let routeData = app.match(request, { matchNotFound: true });
-        if (routeData) {
-            Reflect.set(request, Symbol.for('astro.clientAddress'), request.headers.get('cf-connecting-ip'));
-            const locals = {
-                runtime: {
-                    waitUntil: (promise) => {
-                        context.waitUntil(promise);
-                    },
-                    env: context.env,
-                    cf: request.cf,
-                    caches: caches,
+        let routeData = app.match(request);
+        Reflect.set(request, Symbol.for('astro.clientAddress'), request.headers.get('cf-connecting-ip'));
+        const locals = {
+            runtime: {
+                waitUntil: (promise) => {
+                    context.waitUntil(promise);
                 },
-            };
-            let response = await app.render(request, routeData, locals);
-            if (app.setCookieHeaders) {
-                for (const setCookieHeader of app.setCookieHeaders(response)) {
-                    response.headers.append('Set-Cookie', setCookieHeader);
-                }
+                env: context.env,
+                cf: request.cf,
+                caches: caches,
+            },
+        };
+        let response = await app.render(request, routeData, locals);
+        if (app.setCookieHeaders) {
+            for (const setCookieHeader of app.setCookieHeaders(response)) {
+                response.headers.append('Set-Cookie', setCookieHeader);
             }
-            return response;
         }
-        return new Response(null, {
-            status: 404,
-            statusText: 'Not found',
-        });
+        return response;
     };
     return { onRequest, manifest };
 }

package/dist/index.js

@@ -390,11 +390,14 @@ export default function createIntegration(args) {
                     /**
                      * These route types are candiates for being part of the `_routes.json` `include` array.
                      */
+                    let notFoundIsSSR = false;
                     const potentialFunctionRouteTypes = ['endpoint', 'page'];
                     const functionEndpoints = routes
                         // Certain route types, when their prerender option is set to false, run on the server as function invocations
                         .filter((route) => potentialFunctionRouteTypes.includes(route.type) && !route.prerender)
                         .map((route) => {
+                        if (route.component === 'src/pages/404.astro' && route.prerender === false)
+                            notFoundIsSSR = true;
                         const includePattern = '/' +
                             route.segments
                                 .flat()
@@ -499,7 +502,11 @@ export default function createIntegration(args) {
                     const excludeStrategyLength = excludeStrategy
                         ? excludeStrategy.include.length + excludeStrategy.exclude.length
                         : Infinity;
-                    const winningStrategy = includeStrategyLength <= excludeStrategyLength ? includeStrategy : excludeStrategy;
+                    const winningStrategy = notFoundIsSSR
+                        ? excludeStrategy
+                        : includeStrategyLength <= excludeStrategyLength
+                            ? includeStrategy
+                            : excludeStrategy;
                     await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
                         version: 1,
                         ...winningStrategy,

package/package.json

@@ -2,7 +2,7 @@
   "//comment": "test changeset-bot",
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "7.7.0",
+  "version": "7.7.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",