refactor: convert require.resolve patches to astgrep (#707)

vicb · web-flow · commit 477288f641d8 · 2025-06-05T12:02:11.000+02:00
diff --git a/packages/cloudflare/src/cli/build/bundle-server.ts b/packages/cloudflare/src/cli/build/bundle-server.ts
@@ -16,6 +16,7 @@ import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
 import { patchNextServer } from "./patches/plugins/next-server.js";
+import { patchResolveCache } from "./patches/plugins/open-next.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchPagesRouterContext } from "./patches/plugins/pages-router-context.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
@@ -99,6 +100,7 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
       inlineLoadManifest(updater, buildOpts),
       patchNextServer(updater, buildOpts),
       patchDepdDeprecations(updater),
+      patchResolveCache(updater, buildOpts),
       // Apply updater updates, must be the last plugin
       updater.plugin,
     ] as Plugin[],
@@ -172,21 +174,7 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
  */
 export async function updateWorkerBundledCode(workerOutputFile: string): Promise<void> {
   const code = await readFile(workerOutputFile, "utf8");
-
-  const patchedCode = await patchCodeWithValidations(code, [
-    ["require", patches.patchRequire],
-    [
-      "`require.resolve` call",
-      // workers do not support dynamic require nor require.resolve
-      (code) => code.replace('require.resolve("./cache.cjs")', '"unused"'),
-    ],
-    [
-      "`require.resolve composable cache` call",
-      // workers do not support dynamic require nor require.resolve
-      (code) => code.replace('require.resolve("./composable-cache.cjs")', '"unused"'),
-    ],
-  ]);
-
+  const patchedCode = await patchCodeWithValidations(code, [["require", patches.patchRequire]]);
   await writeFile(workerOutputFile, patchedCode);
 }
 
diff --git a/packages/cloudflare/src/cli/build/patches/plugins/next-server.ts b/packages/cloudflare/src/cli/build/patches/plugins/next-server.ts
@@ -9,7 +9,7 @@
  */
 
 import { existsSync, readFileSync } from "node:fs";
-import path, { join } from "node:path";
+import path from "node:path";
 
 import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
@@ -31,7 +31,7 @@ export function patchNextServer(updater: ContentUpdater, buildOpts: BuildOptions
 
           contents = patchCode(contents, buildIdRule);
 
-          const manifestPath = join(
+          const manifestPath = path.join(
             outputDir,
             "server-functions/default",
             getPackagePath(buildOpts),
diff --git a/packages/cloudflare/src/cli/build/patches/plugins/open-next.ts b/packages/cloudflare/src/cli/build/patches/plugins/open-next.ts
@@ -0,0 +1,51 @@
+/**
+ * Removed unused `require.resolve` calls in Open Next.
+ */
+
+import path from "node:path";
+
+import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+
+export function patchResolveCache(updater: ContentUpdater, buildOpts: BuildOptions): Plugin {
+  const { outputDir } = buildOpts;
+  const packagePath = getPackagePath(buildOpts);
+  const outputPath = path.join(outputDir, "server-functions/default");
+
+  const indexPath = path.relative(
+    buildOpts.appBuildOutputPath,
+    path.join(outputPath, packagePath, `index.mjs`)
+  );
+
+  console.error({ index: indexPath });
+
+  return updater.updateContent("patch-resolve-cache", [
+    {
+      field: {
+        filter: getCrossPlatformPathRegex(indexPath),
+        contentFilter: /cacheHandlerPath/,
+        callback: async ({ contents }) => {
+          contents = patchCode(contents, cacheHandlerRule);
+          contents = patchCode(contents, compositeCacheHandlerRule);
+          return contents;
+        },
+      },
+    },
+  ]);
+}
+
+export const cacheHandlerRule = `
+rule:
+  pattern: var cacheHandlerPath = __require.resolve("./cache.cjs");
+fix: |-
+  var cacheHandlerPath = "";
+`;
+
+export const compositeCacheHandlerRule = `
+rule:
+  pattern: var composableCacheHandlerPath = __require.resolve("./composable-cache.cjs");
+fix: |-
+  var composableCacheHandlerPath = "";
+`;
