Feat perf improvement

.changeset/lovely-rooms-taste.md

@@ -0,0 +1,8 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+some performance improvements
+
+- `enableCacheInterception` is now enabled by default, it loads ISR/SSG pages from cache without waiting for the js page bundle to load
+- `routePreloadingBehavior` is now set to `withWaitUntil`, which means a single route js will be lazy loaded on cold start, but other routes will be preloaded using `waitUntil` for better performance

examples/e2e/experimental/open-next.config.ts

@@ -14,4 +14,6 @@ export default defineCloudflareConfig({
     },
   }),
   queue: doQueue,
+  // Cache interception will break PPR
+  enableCacheInterception: false,
 });

examples/e2e/pages-router/open-next.config.ts

@@ -5,4 +5,6 @@ import memoryQueue from "@opennextjs/cloudflare/overrides/queue/memory-queue";
 export default defineCloudflareConfig({
   incrementalCache: r2IncrementalCache,
   queue: memoryQueue,
+  // We disable it because it breaks an e2e test that checks for the `x-powered-by` header
+  enableCacheInterception: false,
 });

examples/next-partial-prerendering/open-next.config.ts

@@ -1,3 +1,5 @@
 import { defineCloudflareConfig } from '@opennextjs/cloudflare/config';
 
-export default defineCloudflareConfig();
+export default defineCloudflareConfig({
+  enableCacheInterception: false,
+});

packages/cloudflare/src/api/config.ts

@@ -28,6 +28,13 @@ export type CloudflareOverrides = {
    * Sets the revalidation queue implementation
    */
   queue?: "direct" | Override<Queue>;
+
+  /**
+   * Enable cache interception
+   * Disable this if you want to use PPR
+   * @default true
+   */
+  enableCacheInterception?: boolean;
 };
 
 /**
@@ -37,7 +44,7 @@ export type CloudflareOverrides = {
  * @returns the OpenNext configuration object
  */
 export function defineCloudflareConfig(config: CloudflareOverrides = {}): OpenNextConfig {
-  const { incrementalCache, tagCache, queue } = config;
+  const { incrementalCache, tagCache, queue, enableCacheInterception = true } = config;
 
   return {
     default: {
@@ -49,12 +56,16 @@ export function defineCloudflareConfig(config: CloudflareOverrides = {}): OpenNe
         tagCache: resolveTagCache(tagCache),
         queue: resolveQueue(queue),
       },
+      routePreloadingBehavior: "withWaitUntil",
     },
     // node:crypto is used to compute cache keys
     edgeExternals: ["node:crypto"],
     cloudflare: {
       useWorkerdCondition: true,
     },
+    dangerous: {
+      enableCacheInterception,
+    },
   };
 }