fix: make sure that fetch cache sets are properly awaited (#364)

Next.js does not await promises that update the incremental cache for fetch requests,
that is needed in our runtime otherwise the cache updates get lost, so this change
makes sure that the promise is properly awaited via `waitUntil`

---------

Co-authored-by: Victor Berchet <[email protected]>

Author: dario-piotrowicz

.changeset/few-ducks-listen.md

@@ -0,0 +1,9 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix: make sure that fetch cache `set`s are properly awaited
+
+Next.js does not await promises that update the incremental cache for fetch requests,
+that is needed in our runtime otherwise the cache updates get lost, so this change
+makes sure that the promise is properly awaited via `waitUntil`

examples/e2e/app-router/e2e/ssr.test.ts

@@ -28,7 +28,7 @@ test.skip("Server Side Render and loading.tsx", async ({ page }) => {
   }
 });
 
-test.skip("Fetch cache properly cached", async ({ page }) => {
+test("Fetch cache properly cached", async ({ page }) => {
   await page.goto("/ssr");
   const originalDate = await page.getByText("Cached fetch:").textContent();
   await page.waitForTimeout(2000);

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -10,6 +10,7 @@ import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
 import * as patches from "./patches/index.js";
 import { ContentUpdater } from "./patches/plugins/content-updater.js";
+import { patchFetchCacheSetMissingWaitUntil } from "./patches/plugins/fetch-cache-wait-until.js";
 import { patchLoadInstrumentation } from "./patches/plugins/load-instrumentation.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { fixRequire } from "./patches/plugins/require.js";
@@ -87,6 +88,7 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
       fixRequire(updater),
       handleOptionalDependencies(optionalDependencies),
       patchLoadInstrumentation(updater),
+      patchFetchCacheSetMissingWaitUntil(updater),
       // Apply updater updaters, must be the last plugin
       updater.plugin,
     ],

packages/cloudflare/src/cli/build/patches/plugins/content-updater.ts

@@ -62,10 +62,10 @@ export class ContentUpdater {
             if (namespace !== undefined && args.namespace !== namespace) {
               continue;
             }
-            if (!filter.test(args.path)) {
+            if (!args.path.match(filter)) {
               continue;
             }
-            if (!contentFilter.test(contents)) {
+            if (!contents.match(contentFilter)) {
               continue;
             }
             contents = (await callback({ contents, path: args.path })) ?? contents;