@bleedingdev/modern-js-app-tools-extensions 3.9.0-ultramodern.9 → 3.9.3-ultramodern.10

package/src/templates/cloudflare-entry.006-fetch-handler.mjs

@@ -1,5 +1,12 @@
 export default {
   async fetch(request, env, ctx) {
+    const rendererRejection = createWorkerRendererGuardResponse(request);
+    if (rendererRejection) {
+      return finalizeResponseForRequest(
+        withAppCorsHeaders(rendererRejection, request),
+        request,
+      );
+    }
     const corsPreflightResponse = await createCorsPreflightResponse(
       request,
       env,
@@ -9,7 +16,7 @@ export default {
       return finalizeResponseForRequest(corsPreflightResponse, request);
     }
 
-    const bffResponse = await dispatchBffRequest(request, env);
+    const bffResponse = await dispatchBffRequest(request, env, ctx);
 
     if (bffResponse) {
       return finalizeResponseForRequest(
@@ -49,10 +56,12 @@ export default {
       );
     }
 
-    const localeRedirectResponse = createLocaleRedirectResponseForRequest(
-      route,
-      request,
-    );
+    // Native entries resolve the request language in their own handler, with
+    // the same resolver the Node host uses; the legacy detector would differ.
+    const localeRedirectResponse =
+      route?.worker && getNativeRouteIdentity(route)
+        ? null
+        : createLocaleRedirectResponseForRequest(route, request);
 
     if (localeRedirectResponse) {
       return finalizeResponseForRequest(
@@ -62,11 +71,21 @@ export default {
     }
 
     if (route?.worker) {
-      const renderableRequest = createRenderableRequest(request);
+      // Route data requests keep their method, as on the Node server.
+      const routeDataResponse = await dispatchRouteDataRequest(route, request);
 
       return finalizeResponseForRequest(
         withAppCorsHeaders(
-          await dispatchRouteWorker(route, renderableRequest, env, ctx),
+          routeDataResponse ??
+            (await dispatchRouteWorker(
+              route,
+              // The native dispatcher handles HEAD itself, as on Node.
+              getNativeRouteIdentity(route)
+                ? request
+                : createRenderableRequest(request),
+              env,
+              ctx,
+            )),
           request,
         ),
         request,