fix res.revalidate

Author: conico974

examples/e2e/pages-router/src/pages/api/revalidate.ts

@@ -0,0 +1,11 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await res.revalidate('/ssg/')
+    return res.json({ hello: "OpenNext rocks!" });
+  }catch(e){
+    console.error(e)
+    return res.status(500).json({error: "An error occurred"})
+  }
+}

examples/e2e/pages-router/src/pages/ssg/index.tsx

@@ -0,0 +1,19 @@
+import type { InferGetStaticPropsType } from "next";
+import Link from "next/link";
+
+export async function getStaticProps() {
+  return {
+    props: {
+      time: new Date().toISOString(),
+    },
+  };
+}
+
+export default function Page({ time }: InferGetStaticPropsType<typeof getStaticProps>) {
+  return (
+    <div>
+      <div className="flex">Time: {time}</div>
+      <Link href="/">Home</Link>
+    </div>
+  );
+}

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

@@ -22,6 +22,7 @@ import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
+import { patchResRevalidate } from "./patches/plugins/res-revalidate.js";
 import { setWranglerExternal } from "./patches/plugins/wrangler-external.js";
 import { needsExperimentalReact, normalizePath, patchCodeWithValidations } from "./utils/index.js";
 
@@ -101,6 +102,7 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
       inlineLoadManifest(updater, buildOpts),
       inlineBuildId(updater),
       patchDepdDeprecations(updater),
+      patchResRevalidate(updater),
       patchNextMinimal(updater),
       // Apply updater updaters, must be the last plugin
       updater.plugin,

packages/cloudflare/src/cli/build/patches/plugins/res-revalidate.ts

@@ -0,0 +1,74 @@
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+
+import { patchCode } from "../ast/util.js";
+import { ContentUpdater } from "./content-updater.js";
+
+export const rule = `
+rule:
+  kind: await_expression
+  inside:
+    kind: if_statement
+    stopBy: end
+    has:
+      kind: parenthesized_expression
+      has: { kind: property_identifier , stopBy: end, regex: trustHostHeader}
+  has: 
+    kind: call_expression
+    all:
+      - has: {kind: identifier, pattern: fetch}
+      - has:
+          kind: arguments
+          all: 
+            - has:
+                kind: object
+                all: 
+                  - has:
+                      kind: pair
+                      all:
+                        - has: {kind: property_identifier, regex: method }
+                        - has: {kind: string, regex: 'HEAD'}
+                  - has:
+                      kind: pair
+                      all:
+                        - has: {kind: property_identifier, regex: headers}
+                        - has: {kind: identifier, pattern: $HEADERS}
+            - has:
+                kind: template_string
+                all:
+                  - has:
+                      kind: string_fragment
+                      regex: https://
+                  - has:
+                      kind: template_substitution
+                      all:
+                        - has: { kind: identifier, stopBy: end, pattern: $REQ }
+                        - has:
+                            kind: property_identifier
+                            regex: headers
+                            stopBy: end
+                        - has: 
+                            kind: property_identifier
+                            regex: host
+                            stopBy: end
+                  - has:
+                      kind: template_substitution
+                      pattern: $URL_PATH
+                      has:
+                        kind: identifier
+                      
+fix: await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.NEXT_CACHE_REVALIDATION_WORKER.fetch(\`\${$REQ.headers.host.includes("localhost") ? "http":"https" }://\${$REQ.headers.host}$URL_PATH\`,{method:'HEAD', headers:$HEADERS})
+`
+
+export function patchResRevalidate(updater: ContentUpdater) {
+  return updater.updateContent(
+    "patch-res-revalidate",
+    {
+      filter: getCrossPlatformPathRegex(
+        String.raw`(pages-api\.runtime\.prod\.js|api-resolver\.js)$`,
+        { escape: false }
+      ),
+      contentFilter: /\.trustHostHeader/,
+    },
+    ({ contents }) => patchCode(contents, rule)
+  );
+}