@opennextjs/cloudflare 0.5.12 → 0.6.1

package/dist/cli/build/build.d.ts

@@ -1,9 +1,13 @@
+import { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 import type { ProjectOptions } from "../project-options.js";
 /**
  * Builds the application in a format that can be passed to workerd
  *
  * It saves the output in a `.worker-next` directory
  *
+ * @param options The OpenNext options
+ * @param config The OpenNext config
  * @param projectOpts The options for the project
  */
-export declare function build(projectOpts: ProjectOptions): Promise<void>;
+export declare function build(options: BuildOptions, config: OpenNextConfig, projectOpts: ProjectOptions): Promise<void>;

package/dist/cli/build/build.js

@@ -1,39 +1,28 @@
-import { createRequire } from "node:module";
-import { dirname } from "node:path";
 import { buildNextjsApp, setStandaloneBuildMode } from "@opennextjs/aws/build/buildNextApp.js";
 import { compileCache } from "@opennextjs/aws/build/compileCache.js";
-import { compileOpenNextConfig } from "@opennextjs/aws/build/compileConfig.js";
 import { createCacheAssets, createStaticAssets } from "@opennextjs/aws/build/createAssets.js";
 import { createMiddleware } from "@opennextjs/aws/build/createMiddleware.js";
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
-import { printHeader, showWarningOnWindows } from "@opennextjs/aws/build/utils.js";
+import { printHeader } from "@opennextjs/aws/build/utils.js";
 import logger from "@opennextjs/aws/logger.js";
 import { bundleServer } from "./bundle-server.js";
 import { compileCacheAssetsManifestSqlFile } from "./open-next/compile-cache-assets-manifest.js";
 import { compileEnvFiles } from "./open-next/compile-env-files.js";
+import { compileDurableObjects } from "./open-next/compileDurableObjects.js";
 import { copyCacheAssets } from "./open-next/copyCacheAssets.js";
 import { createServerBundle } from "./open-next/createServerBundle.js";
-import { createOpenNextConfigIfNotExistent, createWranglerConfigIfNotExistent, ensureCloudflareConfig, } from "./utils/index.js";
+import { createWranglerConfigIfNotExistent } from "./utils/index.js";
 import { getVersion } from "./utils/version.js";
 /**
  * Builds the application in a format that can be passed to workerd
  *
  * It saves the output in a `.worker-next` directory
  *
+ * @param options The OpenNext options
+ * @param config The OpenNext config
  * @param projectOpts The options for the project
  */
-export async function build(projectOpts) {
-    printHeader("Cloudflare build");
-    showWarningOnWindows();
-    const baseDir = projectOpts.sourceDir;
-    const require = createRequire(import.meta.url);
-    const openNextDistDir = dirname(require.resolve("@opennextjs/aws/index.js"));
-    await createOpenNextConfigIfNotExistent(projectOpts);
-    const { config, buildDir } = await compileOpenNextConfig(baseDir);
-    ensureCloudflareConfig(config);
-    // Initialize options
-    const options = buildHelper.normalizeOptions(config, openNextDistDir, buildDir);
-    logger.setLevel(options.debug ? "debug" : "info");
+export async function build(options, config, projectOpts) {
     // Do not minify the code so that we can apply string replacement patch.
     // Note that wrangler will still minify the bundle.
     options.minify = false;
@@ -72,6 +61,7 @@ export async function build(projectOpts) {
         }
     }
     await createServerBundle(options);
+    await compileDurableObjects(options);
     await bundleServer(options);
     if (!projectOpts.skipWranglerConfigCheck) {
         await createWranglerConfigIfNotExistent(projectOpts);
@@ -79,8 +69,8 @@ export async function build(projectOpts) {
     logger.info("OpenNext build complete.");
 }
 function ensureNextjsVersionSupported(options) {
-    if (buildHelper.compareSemver(options.nextVersion, "14.0.0") < 0) {
-        logger.error("Next.js version unsupported, please upgrade to version 14 or greater.");
+    if (buildHelper.compareSemver(options.nextVersion, "<", "14.2.0")) {
+        logger.error("Next.js version unsupported, please upgrade to version 14.2 or greater.");
         process.exit(1);
     }
 }

package/dist/cli/build/bundle-server.js

@@ -3,15 +3,14 @@ import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { ContentUpdater } from "@opennextjs/aws/plugins/content-updater.js";
 import { build } from "esbuild";
 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 { inlineBuildId } from "./patches/plugins/build-id.js";
-import { ContentUpdater } from "./patches/plugins/content-updater.js";
 import { inlineDynamicRequires } from "./patches/plugins/dynamic-requires.js";
 import { inlineEvalManifest } from "./patches/plugins/eval-manifest.js";
-import { patchFetchCacheSetMissingWaitUntil } from "./patches/plugins/fetch-cache-wait-until.js";
 import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
@@ -43,7 +42,8 @@ const optionalDependencies = [
 export async function bundleServer(buildOpts) {
     patches.copyPackageCliFiles(packageDistDir, buildOpts);
     const { appPath, outputDir, monorepoRoot } = buildOpts;
-    const serverFiles = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/required-server-files.json");
+    const baseManifestPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
+    const serverFiles = path.join(baseManifestPath, "required-server-files.json");
     const nextConfig = JSON.parse(fs.readFileSync(serverFiles, "utf-8")).config;
     console.log(`\x1b[35m⚙️ Bundling the OpenNext server...\n\x1b[0m`);
     await patchWebpackRuntime(buildOpts);
@@ -52,7 +52,7 @@ export async function bundleServer(buildOpts) {
     const packagePath = getPackagePath(buildOpts);
     const openNextServer = path.join(outputPath, packagePath, `index.mjs`);
     const openNextServerBundle = path.join(outputPath, packagePath, `handler.mjs`);
-    const updater = new ContentUpdater();
+    const updater = new ContentUpdater(buildOpts);
     const result = await build({
         entryPoints: [openNextServer],
         bundle: true,
@@ -78,14 +78,13 @@ export async function bundleServer(buildOpts) {
             fixRequire(updater),
             handleOptionalDependencies(optionalDependencies),
             patchInstrumentation(updater, buildOpts),
-            patchFetchCacheSetMissingWaitUntil(updater),
             inlineEvalManifest(updater, buildOpts),
             inlineFindDir(updater, buildOpts),
             inlineLoadManifest(updater, buildOpts),
             inlineBuildId(updater),
             patchDepdDeprecations(updater),
             patchNextMinimal(updater),
-            // Apply updater updaters, must be the last plugin
+            // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
         external: ["./middleware/handler.mjs"],
@@ -102,7 +101,6 @@ export async function bundleServer(buildOpts) {
             // Note: we apply an empty shim to next/dist/compiled/edge-runtime since (amongst others) it generated the following `eval`:
             //   eval(getModuleCode)(module, module.exports, throwingRequire, params.context, ...Object.values(params.scopedContext));
             //   which comes from https://github.com/vercel/edge-runtime/blob/6e96b55f/packages/primitives/src/primitives/load.js#L57-L63
-            // QUESTION: Why did I encountered this but mhart didn't?
             "next/dist/compiled/edge-runtime": path.join(buildOpts.outputDir, "cloudflare-templates/shims/empty.js"),
             // `@next/env` is a library Next.js uses for loading dotenv files, for obvious reasons we need to stub it here
             // source: https://github.com/vercel/next.js/tree/0ac10d79720/packages/next-env
@@ -188,12 +186,6 @@ export async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
             "'require(this.middlewareManifestPath)'",
             (code) => patches.inlineMiddlewareManifestRequire(code, buildOpts),
         ],
-        [
-            "`patchAsyncStorage` call",
-            (code) => code
-                // TODO: implement for cf (possibly in @opennextjs/aws)
-                .replace("patchAsyncStorage();", "//patchAsyncStorage();"),
-        ],
         [
             "`require.resolve` call",
             // workers do not support dynamic require nor require.resolve

package/dist/cli/build/open-next/compile-cache-assets-manifest.d.ts

@@ -1,6 +1,6 @@
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { TagCacheMetaFile } from "@opennextjs/aws/types/cache.js";
 /**
- * Generates SQL statements that can be used to initialise the cache assets manifest in an SQL data store.
+ * Generates SQL statements that can be used to initialize the cache assets manifest in an SQL data store.
  */
 export declare function compileCacheAssetsManifestSqlFile(options: BuildOptions, metaFiles: TagCacheMetaFile[]): void;

package/dist/cli/build/open-next/compile-cache-assets-manifest.js

@@ -1,17 +1,15 @@
 import { appendFileSync, mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 /**
- * Generates SQL statements that can be used to initialise the cache assets manifest in an SQL data store.
+ * Generates SQL statements that can be used to initialize the cache assets manifest in an SQL data store.
  */
 export function compileCacheAssetsManifestSqlFile(options, metaFiles) {
     const outputPath = path.join(options.outputDir, "cloudflare/cache-assets-manifest.sql");
-    const tagsTable = process.env.NEXT_CACHE_D1_TAGS_TABLE || "tags";
-    const revalidationsTable = process.env.NEXT_CACHE_D1_REVALIDATIONS_TABLE || "revalidations";
     mkdirSync(path.dirname(outputPath), { recursive: true });
-    writeFileSync(outputPath, `CREATE TABLE IF NOT EXISTS ${JSON.stringify(tagsTable)} (tag TEXT NOT NULL, path TEXT NOT NULL, UNIQUE(tag, path) ON CONFLICT REPLACE);
-     CREATE TABLE IF NOT EXISTS ${JSON.stringify(revalidationsTable)} (tag TEXT NOT NULL, revalidatedAt INTEGER NOT NULL, UNIQUE(tag) ON CONFLICT REPLACE);\n`);
+    writeFileSync(outputPath, `CREATE TABLE IF NOT EXISTS tags (tag TEXT NOT NULL, path TEXT NOT NULL, UNIQUE(tag, path) ON CONFLICT REPLACE);
+     CREATE TABLE IF NOT EXISTS revalidations (tag TEXT NOT NULL, revalidatedAt INTEGER NOT NULL, UNIQUE(tag) ON CONFLICT REPLACE);\n`);
     const values = metaFiles.map(({ tag, path }) => `(${JSON.stringify(tag.S)}, ${JSON.stringify(path.S)})`);
     if (values.length) {
-        appendFileSync(outputPath, `INSERT INTO ${JSON.stringify(tagsTable)} (tag, path) VALUES ${values.join(", ")};`);
+        appendFileSync(outputPath, `INSERT INTO tags (tag, path) VALUES ${values.join(", ")};`);
     }
 }

package/dist/cli/build/open-next/compileDurableObjects.d.ts

@@ -0,0 +1,2 @@
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
+export declare function compileDurableObjects(buildOpts: BuildOptions): void;

package/dist/cli/build/open-next/compileDurableObjects.js

@@ -0,0 +1,30 @@
+import { createRequire } from "node:module";
+import path from "node:path";
+import { loadBuildId, loadPrerenderManifest } from "@opennextjs/aws/adapters/config/util.js";
+import { esbuildSync, getPackagePath } from "@opennextjs/aws/build/helper.js";
+export function compileDurableObjects(buildOpts) {
+    const _require = createRequire(import.meta.url);
+    const entryPoints = [
+        _require.resolve("@opennextjs/cloudflare/durable-objects/queue"),
+        _require.resolve("@opennextjs/cloudflare/durable-objects/sharded-tag-cache"),
+    ];
+    const { outputDir } = buildOpts;
+    const baseManifestPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
+    // We need to change the type in aws
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const prerenderManifest = loadPrerenderManifest(baseManifestPath);
+    const previewModeId = prerenderManifest.preview.previewModeId;
+    const BUILD_ID = loadBuildId(baseManifestPath);
+    return esbuildSync({
+        entryPoints,
+        bundle: true,
+        platform: "node",
+        format: "esm",
+        outdir: path.join(buildOpts.buildDir, "durable-objects"),
+        external: ["cloudflare:workers"],
+        define: {
+            "process.env.__NEXT_PREVIEW_MODE_ID": `"${previewModeId}"`,
+            "process.env.__NEXT_BUILD_ID": `"${BUILD_ID}"`,
+        },
+    }, buildOpts);
+}

package/dist/cli/build/open-next/copyCacheAssets.js

@@ -1,6 +1,6 @@
 import { cpSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
-import { CACHE_ASSET_DIR } from "../../../api/kv-cache.js";
+import { CACHE_ASSET_DIR } from "../../../api/overrides/incremental-cache/kv-incremental-cache.js";
 export function copyCacheAssets(options) {
     const { outputDir } = options;
     const srcPath = join(outputDir, "cache");

package/dist/cli/build/open-next/createServerBundle.d.ts

@@ -1,2 +1,10 @@
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
-export declare function createServerBundle(options: buildHelper.BuildOptions): Promise<void>;
+import type { CodePatcher } from "@opennextjs/aws/build/patch/codePatcher.js";
+import type { ContentUpdater } from "@opennextjs/aws/plugins/content-updater.js";
+import type { Plugin } from "esbuild";
+interface CodeCustomization {
+    additionalCodePatches?: CodePatcher[];
+    additionalPlugins?: (contentUpdater: ContentUpdater) => Plugin[];
+}
+export declare function createServerBundle(options: buildHelper.BuildOptions, codeCustomization?: CodeCustomization): Promise<void>;
+export {};

package/dist/cli/build/open-next/createServerBundle.js

@@ -8,6 +8,9 @@ import { copyTracedFiles } from "@opennextjs/aws/build/copyTracedFiles.js";
 import { generateEdgeBundle } from "@opennextjs/aws/build/edge/createEdgeBundle.js";
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { installDependencies } from "@opennextjs/aws/build/installDeps.js";
+import { applyCodePatches } from "@opennextjs/aws/build/patch/codePatcher.js";
+import { patchFetchCacheForISR, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patchFetchCacheISR.js";
+import { patchFetchCacheSetMissingWaitUntil } from "@opennextjs/aws/build/patch/patchFetchCacheWaitUntil.js";
 import logger from "@opennextjs/aws/logger.js";
 import { minifyAll } from "@opennextjs/aws/minimize-js.js";
 import { openNextEdgePlugins } from "@opennextjs/aws/plugins/edge.js";
@@ -15,8 +18,9 @@ import { openNextExternalMiddlewarePlugin } from "@opennextjs/aws/plugins/extern
 import { openNextReplacementPlugin } from "@opennextjs/aws/plugins/replacement.js";
 import { openNextResolvePlugin } from "@opennextjs/aws/plugins/resolve.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+import { patchResRevalidate } from "../patches/plugins/res-revalidate.js";
 import { normalizePath } from "../utils/index.js";
-export async function createServerBundle(options) {
+export async function createServerBundle(options, codeCustomization) {
     const { config } = options;
     const foundRoutes = new Set();
     // Get all functions to build
@@ -33,7 +37,7 @@ export async function createServerBundle(options) {
             await generateEdgeBundle(name, options, fnOptions);
         }
         else {
-            await generateBundle(name, options, fnOptions);
+            await generateBundle(name, options, fnOptions, codeCustomization);
         }
     });
     //TODO: throw an error if not all edge runtime routes has been bundled in a separate function
@@ -71,7 +75,7 @@ export async function createServerBundle(options) {
         patterns: ["*"],
     });
 }
-async function generateBundle(name, options, fnOptions) {
+async function generateBundle(name, options, fnOptions, codeCustomization) {
     const { appPath, appBuildOutputPath, config, outputDir, monorepoRoot } = options;
     logger.info(`Building server function: ${name}...`);
     // Create output folder
@@ -104,22 +108,32 @@ async function generateBundle(name, options, fnOptions) {
     // Copy env files
     buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
     // Copy all necessary traced files
-    await copyTracedFiles({
+    const { tracedFiles, manifests } = await copyTracedFiles({
         buildOutputPath: appBuildOutputPath,
         packagePath,
         outputDir: outputPath,
         routes: fnOptions.routes ?? ["app/page.tsx"],
         bundledNextServer: isBundled,
     });
+    const additionalCodePatches = codeCustomization?.additionalCodePatches ?? [];
+    await applyCodePatches(options, tracedFiles, manifests, [
+        patchFetchCacheSetMissingWaitUntil,
+        patchFetchCacheForISR,
+        patchUnstableCacheForISR,
+        // Cloudflare specific patches
+        patchResRevalidate,
+        ...additionalCodePatches,
+    ]);
     // Build Lambda code
     // note: bundle in OpenNext package b/c the adapter relies on the
     //       "serverless-http" package which is not a dependency in user's
     //       Next.js app.
-    const disableNextPrebundledReact = buildHelper.compareSemver(options.nextVersion, "13.5.1") >= 0 ||
-        buildHelper.compareSemver(options.nextVersion, "13.4.1") <= 0;
+    const disableNextPrebundledReact = buildHelper.compareSemver(options.nextVersion, ">=", "13.5.1") ||
+        buildHelper.compareSemver(options.nextVersion, "<=", "13.4.1");
     const overrides = fnOptions.override ?? {};
-    const isBefore13413 = buildHelper.compareSemver(options.nextVersion, "13.4.13") <= 0;
-    const isAfter141 = buildHelper.compareSemver(options.nextVersion, "14.1") >= 0;
+    const isBefore13413 = buildHelper.compareSemver(options.nextVersion, "<=", "13.4.13");
+    const isAfter141 = buildHelper.compareSemver(options.nextVersion, ">=", "14.1");
+    const isAfter142 = buildHelper.compareSemver(options.nextVersion, ">=", "14.2");
     const disableRouting = isBefore13413 || config.middleware?.external;
     const plugins = [
         openNextReplacementPlugin({
@@ -128,6 +142,7 @@ async function generateBundle(name, options, fnOptions) {
             deletes: [
                 ...(disableNextPrebundledReact ? ["applyNextjsPrebundledReact"] : []),
                 ...(disableRouting ? ["withRouting"] : []),
+                ...(isAfter142 ? ["patchAsyncStorage"] : []),
             ],
         }),
         openNextReplacementPlugin({
@@ -143,7 +158,10 @@ async function generateBundle(name, options, fnOptions) {
             fnName: name,
             overrides,
         }),
-        openNextExternalMiddlewarePlugin(path.join(options.openNextDistDir, "core/edgeFunctionHandler.js")),
+        // `openNextExternalMiddlewarePlugin` should only be used with an external middleware
+        ...(config.middleware?.external
+            ? [openNextExternalMiddlewarePlugin(path.join(options.openNextDistDir, "core/edgeFunctionHandler.js"))]
+            : []),
         openNextEdgePlugins({
             nextDir: path.join(options.appBuildOutputPath, ".next"),
             isInCloudfare: true,
@@ -153,6 +171,7 @@ async function generateBundle(name, options, fnOptions) {
     await buildHelper.esbuildAsync({
         entryPoints: [path.join(options.openNextDistDir, "adapters", "server-adapter.js")],
         outfile: path.join(outputPath, packagePath, `index.${outfileExt}`),
+        external: ["./middleware.mjs"],
         banner: {
             js: [
                 `globalThis.monorepoPackagePath = "${normalizePath(packagePath)}";`,

package/dist/cli/build/patches/ast/patch-vercel-og-library.js

@@ -1,8 +1,8 @@
 import { copyFileSync, existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { parseFile } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { globSync } from "glob";
-import { parseFile } from "./util.js";
 import { patchVercelOgFallbackFont, patchVercelOgImport } from "./vercel-og.js";
 /**
  * Patches the usage of @vercel/og to be compatible with Cloudflare Workers.

package/dist/cli/build/patches/ast/vercel-og.d.ts

@@ -1,4 +1,4 @@
-import { SgNode } from "@ast-grep/napi";
+import { SgNode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 export declare const vercelOgImportRule = "\nrule:\n  pattern: $NODE\n  kind: string\n  regex: \"next/dist/compiled/@vercel/og/index\\\\.node\\\\.js\"\ninside:\n  kind: arguments\n  inside:\n    kind: call_expression\n    stopBy: end\n    has:\n      field: function\n      regex: \"import\"\n\nfix: |-\n  \"next/dist/compiled/@vercel/og/index.edge.js\"\n";
 /**
  * Patches Node.js imports for the library to be Edge imports.
@@ -7,8 +7,8 @@ export declare const vercelOgImportRule = "\nrule:\n  pattern: $NODE\n  kind: st
  * @returns Results of applying the rule.
  */
 export declare function patchVercelOgImport(root: SgNode): {
-    edits: import("@ast-grep/napi").Edit[];
-    matches: SgNode<import("@ast-grep/napi/types/staticTypes.js").TypesMap, import("@ast-grep/napi/types/staticTypes.js").Kinds<import("@ast-grep/napi/types/staticTypes.js").TypesMap>>[];
+    edits: import("@opennextjs/aws/build/patch/astCodePatcher").Edit[];
+    matches: SgNode[];
 };
 export declare const vercelOgFallbackFontRule = "\nrule:\n  kind: variable_declaration\n  all:\n    - has:\n        kind: variable_declarator\n        has:\n          kind: identifier\n          regex: ^fallbackFont$\n    - has:\n        kind: call_expression\n        pattern: fetch(new URL(\"$PATH\", $$$REST))\n        stopBy: end\n\nfix: |-\n  async function getFallbackFont() {\n    // .bin is used so that a loader does not need to be configured for .ttf files\n    return (await import(\"$PATH.bin\")).default;\n  }\n\n  var fallbackFont = getFallbackFont();\n";
 /**
@@ -18,6 +18,6 @@ export declare const vercelOgFallbackFontRule = "\nrule:\n  kind: variable_decla
  * @returns Results of applying the rule.
  */
 export declare function patchVercelOgFallbackFont(root: SgNode): {
-    edits: import("@ast-grep/napi").Edit[];
-    matches: SgNode<import("@ast-grep/napi/types/staticTypes.js").TypesMap, import("@ast-grep/napi/types/staticTypes.js").Kinds<import("@ast-grep/napi/types/staticTypes.js").TypesMap>>[];
+    edits: import("@opennextjs/aws/build/patch/astCodePatcher").Edit[];
+    matches: SgNode[];
 };

package/dist/cli/build/patches/ast/vercel-og.js

@@ -1,4 +1,4 @@
-import { applyRule } from "./util.js";
+import { applyRule } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 export const vercelOgImportRule = `
 rule:
   pattern: $NODE

package/dist/cli/build/patches/ast/vercel-og.spec.js

@@ -1,5 +1,5 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, it } from "vitest";
-import { patchCode } from "./util";
 import { vercelOgFallbackFontRule, vercelOgImportRule } from "./vercel-og";
 describe("vercelOgImportRule", () => {
     it("should rewrite a node import to an edge import", () => {

package/dist/cli/build/patches/ast/webpack-runtime.js

@@ -22,7 +22,7 @@
 import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { patchCode } from "./util.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 // Inline the code when there are multiple chunks
 export function buildMultipleChunksRule(chunks) {
     return `

package/dist/cli/build/patches/ast/webpack-runtime.spec.js

@@ -1,5 +1,5 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
-import { patchCode } from "./util.js";
 import { buildMultipleChunksRule, singleChunkRule } from "./webpack-runtime.js";
 describe("webpack runtime", () => {
     describe("multiple chunks", () => {

package/dist/cli/build/patches/plugins/build-id.d.ts

@@ -1,6 +1,6 @@
 /**
  * Inline `getBuildId` as it relies on `readFileSync` that is not supported by workerd.
  */
-import type { ContentUpdater } from "./content-updater.js";
-export declare function inlineBuildId(updater: ContentUpdater): import("esbuild").Plugin;
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function inlineBuildId(updater: ContentUpdater): Plugin;
 export declare const rule = "\nrule:\n  kind: method_definition\n  has:\n    field: name\n    regex: ^getBuildId$\nfix: |-\n  getBuildId() {\n    return process.env.NEXT_BUILD_ID;\n  }\n";

package/dist/cli/build/patches/plugins/build-id.js

@@ -1,13 +1,20 @@
 /**
  * Inline `getBuildId` as it relies on `readFileSync` that is not supported by workerd.
  */
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { patchCode } from "../ast/util.js";
 export function inlineBuildId(updater) {
-    return updater.updateContent("inline-build-id", {
-        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/next-server\.js$`, { escape: false }),
-        contentFilter: /getBuildId\(/,
-    }, async ({ contents }) => patchCode(contents, rule));
+    return updater.updateContent("inline-build-id", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/next-server\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /getBuildId\(/,
+                callback: ({ contents }) => patchCode(contents, rule),
+            },
+        },
+    ]);
 }
 export const rule = `
 rule:

package/dist/cli/build/patches/plugins/build-id.spec.js

@@ -1,5 +1,5 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
-import { patchCode } from "../ast/util.js";
 import { rule } from "./build-id.js";
 describe("getBuildId", () => {
     test("patch", () => {

package/dist/cli/build/patches/plugins/dynamic-requires.d.ts

@@ -1,4 +1,3 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { Plugin } from "esbuild";
-import type { ContentUpdater } from "./content-updater.js";
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 export declare function inlineDynamicRequires(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/dynamic-requires.js

@@ -1,9 +1,9 @@
 import { readFile } from "node:fs/promises";
 import { join, posix, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { normalizePath } from "../../utils/normalize-path.js";
-import { patchCode } from "../ast/util.js";
 async function getPagesManifests(serverDir) {
     try {
         return Object.values(JSON.parse(await readFile(join(serverDir, "pages-manifest.json"), "utf-8")));
@@ -35,16 +35,26 @@ function getRequires(idVariable, files, serverDir) {
         .join("\n");
 }
 export function inlineDynamicRequires(updater, buildOpts) {
-    updater.updateContent("inline-node-module-loader", {
-        filter: getCrossPlatformPathRegex(String.raw `/module-loader/node-module-loader\.js$`, {
-            escape: false,
-        }),
-        contentFilter: /class NodeModuleLoader {/,
-    }, async ({ contents }) => patchCode(contents, await getNodeModuleLoaderRule(buildOpts)));
-    updater.updateContent("inline-require-page", {
-        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
-        contentFilter: /function requirePage\(/,
-    }, async ({ contents }) => patchCode(contents, await getRequirePageRule(buildOpts)));
+    updater.updateContent("inline-node-module-loader", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/module-loader/node-module-loader\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /class NodeModuleLoader {/,
+                callback: async ({ contents }) => patchCode(contents, await getNodeModuleLoaderRule(buildOpts)),
+            },
+        },
+    ]);
+    updater.updateContent("inline-require-page", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
+                contentFilter: /function requirePage\(/,
+                callback: async ({ contents }) => patchCode(contents, await getRequirePageRule(buildOpts)),
+            },
+        },
+    ]);
     return { name: "inline-dynamic-requires", setup() { } };
 }
 async function getNodeModuleLoaderRule(buildOpts) {

package/dist/cli/build/patches/plugins/eval-manifest.d.ts

@@ -3,5 +3,5 @@
  * that are not supported by workerd.
  */
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { ContentUpdater } from "./content-updater.js";
-export declare function inlineEvalManifest(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function inlineEvalManifest(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/eval-manifest.js

@@ -4,15 +4,22 @@
  */
 import { join, posix, relative, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { glob } from "glob";
 import { normalizePath } from "../../utils/normalize-path.js";
-import { patchCode } from "../ast/util.js";
 export function inlineEvalManifest(updater, buildOpts) {
-    return updater.updateContent("inline-eval-manifest", {
-        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest\.js$`, { escape: false }),
-        contentFilter: /function evalManifest\(/,
-    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
+    return updater.updateContent("inline-eval-manifest", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /function evalManifest\(/,
+                callback: async ({ contents }) => patchCode(contents, await getRule(buildOpts)),
+            },
+        },
+    ]);
 }
 async function getRule(buildOpts) {
     const { outputDir } = buildOpts;

package/dist/cli/build/patches/plugins/find-dir.d.ts

@@ -2,5 +2,5 @@
  * Inline `findDir` as it relies on `existsSync` which is not supported by workerd.
  */
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { ContentUpdater } from "./content-updater.js";
-export declare function inlineFindDir(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function inlineFindDir(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/find-dir.js

@@ -4,13 +4,18 @@
 import { existsSync } from "node:fs";
 import { join, posix, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { patchCode } from "../ast/util.js";
 export function inlineFindDir(updater, buildOpts) {
-    return updater.updateContent("inline-find-dir", {
-        filter: getCrossPlatformPathRegex(String.raw `/next/dist/lib/find-pages-dir\.js$`, { escape: false }),
-        contentFilter: /function findDir\(/,
-    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
+    return updater.updateContent("inline-find-dir", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/next/dist/lib/find-pages-dir\.js$`, { escape: false }),
+                contentFilter: /function findDir\(/,
+                callback: async ({ contents }) => patchCode(contents, await getRule(buildOpts)),
+            },
+        },
+    ]);
 }
 async function getRule(buildOpts) {
     const { outputDir } = buildOpts;

package/dist/cli/build/patches/plugins/instrumentation.d.ts

@@ -1,8 +1,5 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { ContentUpdater } from "./content-updater.js";
-export declare function patchInstrumentation(updater: ContentUpdater, buildOpts: BuildOptions): {
-    name: string;
-    setup(): void;
-};
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function patchInstrumentation(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
 export declare function getNext15Rule(builtInstrumentationPath: string | null): string;
 export declare function getNext14Rule(builtInstrumentationPath: string | null): string;