opennextjs · conico974 · Feb 14, 2025 · Feb 17, 2025 · Feb 17, 2025 · Feb 26, 2025
diff --git a/packages/open-next/package.json b/packages/open-next/package.json
@@ -37,6 +37,7 @@
     "README.md"
   ],
   "dependencies": {
+    "@ast-grep/napi": "^0.35.0",
     "@aws-sdk/client-cloudfront": "3.398.0",
     "@aws-sdk/client-dynamodb": "^3.398.0",
     "@aws-sdk/client-lambda": "^3.398.0",
@@ -50,7 +51,8 @@
     "esbuild": "0.19.2",
     "express": "5.0.1",
     "path-to-regexp": "^6.3.0",
-    "urlpattern-polyfill": "^10.0.0"
+    "urlpattern-polyfill": "^10.0.0",
+    "yaml": "^2.7.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",

diff --git a/packages/open-next/src/adapters/config/util.ts b/packages/open-next/src/adapters/config/util.ts
@@ -21,10 +21,14 @@ export function loadBuildId(nextDir: string) {
   return fs.readFileSync(filePath, "utf-8").trim();
 }
 
-export function loadHtmlPages(nextDir: string) {
+export function loadPagesManifest(nextDir: string) {
   const filePath = path.join(nextDir, "server/pages-manifest.json");
   const json = fs.readFileSync(filePath, "utf-8");
-  return Object.entries(JSON.parse(json))
+  return JSON.parse(json);
+}
+
+export function loadHtmlPages(nextDir: string) {
+  return Object.entries(loadPagesManifest(nextDir))
     .filter(([_, value]) => (value as string).endsWith(".html"))
     .map(([key]) => key);
 }

diff --git a/packages/open-next/src/build/copyTracedFiles.ts b/packages/open-next/src/build/copyTracedFiles.ts
@@ -13,7 +13,15 @@ import {
 } from "node:fs";
 import path from "node:path";
 
-import { loadConfig, loadPrerenderManifest } from "config/util.js";
+import {
+  loadAppPathsManifest,
+  loadBuildId,
+  loadConfig,
+  loadFunctionsConfigManifest,
+  loadMiddlewareManifest,
+  loadPagesManifest,
+  loadPrerenderManifest,
+} from "config/util.js";
 import { getCrossPlatformPathRegex } from "utils/regex.js";
 import logger from "../logger.js";
 import { MIDDLEWARE_TRACE_FILE } from "./constant.js";
@@ -50,6 +58,19 @@ interface CopyTracedFilesOptions {
   skipServerFiles?: boolean;
 }
 
+// TODO: add all the necessary manifests here
+function getManifests(nextDir: string) {
+  return {
+    buildId: loadBuildId(nextDir),
+    config: loadConfig(nextDir),
+    prerenderManifest: loadPrerenderManifest(nextDir),
+    pagesManifest: loadPagesManifest(nextDir),
+    appPathsManifest: loadAppPathsManifest(nextDir),
+    middlewareManifest: loadMiddlewareManifest(nextDir),
+    functionsConfigManifest: loadFunctionsConfigManifest(nextDir),
+  };
+}
+
 // eslint-disable-next-line sonarjs/cognitive-complexity
 export async function copyTracedFiles({
   buildOutputPath,
@@ -323,4 +344,9 @@ File ${fullFilePath} does not exist
   }
 
   logger.debug("copyTracedFiles:", Date.now() - tsStart, "ms");
+
+  return {
+    tracedFiles: filesToCopy.values(),
+    manifests: getManifests(standaloneNextDir),
+  };
 }
diff --git a/packages/open-next/src/build/createMiddleware.ts b/packages/open-next/src/build/createMiddleware.ts
@@ -81,6 +81,7 @@ export async function createMiddleware(
       additionalExternals: config.edgeExternals,
       onlyBuildOnce: forceOnlyBuildOnce === true,
       name: "middleware",
+      additionalPlugins: () => [],
     });
 
     installDependencies(outputPath, config.middleware?.install);
@@ -96,6 +97,7 @@ export async function createMiddleware(
       options,
       onlyBuildOnce: true,
       name: "middleware",
+      additionalPlugins: () => [],
     });
   }
 }
diff --git a/packages/open-next/src/build/createServerBundle.ts b/packages/open-next/src/build/createServerBundle.ts
@@ -3,8 +3,10 @@ import path from "node:path";
 
 import type { FunctionOptions, SplittedFunctionOptions } from "types/open-next";
 
+import type { Plugin } from "esbuild";
 import logger from "../logger.js";
 import { minifyAll } from "../minimize-js.js";
+import { ContentUpdater } from "../plugins/content-updater.js";
 import { openNextReplacementPlugin } from "../plugins/replacement.js";
 import { openNextResolvePlugin } from "../plugins/resolve.js";
 import { getCrossPlatformPathRegex } from "../utils/regex.js";
@@ -14,8 +16,21 @@ import { copyTracedFiles } from "./copyTracedFiles.js";
 import { generateEdgeBundle } from "./edge/createEdgeBundle.js";
 import * as buildHelper from "./helper.js";
 import { installDependencies } from "./installDeps.js";
+import { type CodePatcher, applyCodePatches } from "./patch/codePatcher.js";
+import { patchFetchCacheSetMissingWaitUntil } from "./patch/patchFetchCacheWaitUntil.js";
+
+interface CodeCustomization {
+  // These patches are meant to apply on user and next generated code
+  additionalCodePatches: CodePatcher[];
+  // These plugins are meant to apply during the esbuild bundling process.
+  // This will only apply to OpenNext code.
+  additionalPlugins: (contentUpdater: ContentUpdater) => Plugin[];
+}
 
-export async function createServerBundle(options: buildHelper.BuildOptions) {
+export async function createServerBundle(
+  options: buildHelper.BuildOptions,
+  codeCustomization?: CodeCustomization,
+) {
   const { config } = options;
   const foundRoutes = new Set<string>();
   // Get all functions to build
@@ -36,7 +51,7 @@ export async function createServerBundle(options: buildHelper.BuildOptions) {
     if (fnOptions.runtime === "edge") {
       await generateEdgeBundle(name, options, fnOptions);
     } else {
-      await generateBundle(name, options, fnOptions);
+      await generateBundle(name, options, fnOptions, codeCustomization);
     }
   });
 
@@ -101,6 +116,7 @@ async function generateBundle(
   name: string,
   options: buildHelper.BuildOptions,
   fnOptions: SplittedFunctionOptions,
+  codeCustomization?: CodeCustomization,
 ) {
   const { appPath, appBuildOutputPath, config, outputDir, monorepoRoot } =
     options;
@@ -152,15 +168,23 @@ async function generateBundle(
   // Copy env files
   buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
 
-  // Copy all necessary traced files
-  await copyTracedFiles({
+  // Copy all necessary traced files{
+  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, Array.from(tracedFiles), manifests, [
+    // TODO: create real code patchers here
+    patchFetchCacheSetMissingWaitUntil,
+    ...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
@@ -179,6 +203,10 @@ async function generateBundle(
 
   const disableRouting = isBefore13413 || config.middleware?.external;
 
+  const updater = new ContentUpdater(options);
+
+  const additionalPlugins = codeCustomization?.additionalPlugins(updater) ?? [];
+
   const plugins = [
     openNextReplacementPlugin({
       name: `requestHandlerOverride ${name}`,
@@ -204,6 +232,8 @@ async function generateBundle(
       fnName: name,
       overrides,
     }),
+    ...additionalPlugins,
+    updater.plugin,
   ];
 
   const outfileExt = fnOptions.runtime === "deno" ? "ts" : "mjs";

diff --git a/packages/open-next/src/build/edge/createEdgeBundle.ts b/packages/open-next/src/build/edge/createEdgeBundle.ts
@@ -2,7 +2,7 @@ import { mkdirSync } from "node:fs";
 
 import fs from "node:fs";
 import path from "node:path";
-import { build } from "esbuild";
+import { type Plugin, build } from "esbuild";
 import type { MiddlewareInfo } from "types/next-types";
 import type {
   IncludedConverter,
@@ -16,6 +16,7 @@ import type {
 import { loadMiddlewareManifest } from "config/util.js";
 import type { OriginResolver } from "types/overrides.js";
 import logger from "../../logger.js";
+import { ContentUpdater } from "../../plugins/content-updater.js";
 import { openNextEdgePlugins } from "../../plugins/edge.js";
 import { openNextExternalMiddlewarePlugin } from "../../plugins/externalMiddleware.js";
 import { openNextReplacementPlugin } from "../../plugins/replacement.js";
@@ -39,6 +40,7 @@ interface BuildEdgeBundleOptions {
   additionalExternals?: string[];
   onlyBuildOnce?: boolean;
   name: string;
+  additionalPlugins: (contentUpdater: ContentUpdater) => Plugin[];
 }
 
 export async function buildEdgeBundle({
@@ -53,13 +55,16 @@ export async function buildEdgeBundle({
   additionalExternals,
   onlyBuildOnce,
   name,
+  additionalPlugins: additionalPluginsFn,
 }: BuildEdgeBundleOptions) {
   const isInCloudfare = await isEdgeRuntime(overrides);
   function override<T extends keyof Override>(target: T) {
     return typeof overrides?.[target] === "string"
       ? overrides[target]
       : undefined;
   }
+  const contentUpdater = new ContentUpdater(options);
+  const additionalPlugins = additionalPluginsFn(contentUpdater);
   await esbuildAsync(
     {
       entryPoints: [entrypoint],
@@ -98,6 +103,8 @@ export async function buildEdgeBundle({
           nextDir: path.join(options.appBuildOutputPath, ".next"),
           isInCloudfare,
         }),
+        ...additionalPlugins,
+        contentUpdater.plugin,
       ],
       treeShaking: true,
       alias: {
@@ -173,6 +180,7 @@ export async function generateEdgeBundle(
   name: string,
   options: BuildOptions,
   fnOptions: SplittedFunctionOptions,
+  additionalPlugins: (contentUpdater: ContentUpdater) => Plugin[] = () => [],
 ) {
   logger.info(`Generating edge bundle for: ${name}`);
 
@@ -226,5 +234,6 @@ export async function generateEdgeBundle(
     overrides: fnOptions.override,
     additionalExternals: options.config.edgeExternals,
     name,
+    additionalPlugins,
   });
 }
diff --git a/packages/open-next/src/build/patch/astCodePatcher.ts b/packages/open-next/src/build/patch/astCodePatcher.ts
@@ -0,0 +1,114 @@
+// Mostly copied from the cloudflare adapter
+import { readFileSync } from "node:fs";
+
+import {
+  type Edit,
+  Lang,
+  type NapiConfig,
+  type SgNode,
+  parse,
+} from "@ast-grep/napi";
+import yaml from "yaml";
+import type { PatchCodeFn } from "./codePatcher";
+
+/**
+ * fix has the same meaning as in yaml rules
+ * see https://ast-grep.github.io/guide/rewrite-code.html#using-fix-in-yaml-rule
+ */
+export type RuleConfig = NapiConfig & { fix?: string };
+
+/**
+ * Returns the `Edit`s and `Match`es for an ast-grep rule in yaml format
+ *
+ * The rule must have a `fix` to rewrite the matched node.
+ *
+ * Tip: use https://ast-grep.github.io/playground.html to create rules.
+ *
+ * @param rule The rule. Either a yaml string or an instance of `RuleConfig`
+ * @param root The root node
+ * @param once only apply once
+ * @returns A list of edits and a list of matches.
+ */
+export function applyRule(
+  rule: string | RuleConfig,
+  root: SgNode,
+  { once = false } = {},
+) {
+  const ruleConfig: RuleConfig =
+    typeof rule === "string" ? yaml.parse(rule) : rule;
+  if (ruleConfig.transform) {
+    throw new Error("transform is not supported");
+  }
+  if (!ruleConfig.fix) {
+    throw new Error("no fix to apply");
+  }
+
+  const fix = ruleConfig.fix;
+
+  const matches = once
+    ? [root.find(ruleConfig)].filter((m) => m !== null)
+    : root.findAll(ruleConfig);
+
+  const edits: Edit[] = [];
+
+  matches.forEach((match) => {
+    edits.push(
+      match.replace(
+        // Replace known placeholders by their value
+        fix
+          .replace(/\$\$\$([A-Z0-9_]+)/g, (_m, name) =>
+            match
+              .getMultipleMatches(name)
+              .map((n) => n.text())
+              .join(""),
+          )
+          .replace(
+            /\$([A-Z0-9_]+)/g,
+            (m, name) => match.getMatch(name)?.text() ?? m,
+          ),
+      ),
+    );
+  });
+
+  return { edits, matches };
+}
+
+/**
+ * Parse a file and obtain its root.
+ *
+ * @param path The file path
+ * @param lang The language to parse. Defaults to TypeScript.
+ * @returns The root for the file.
+ */
+export function parseFile(path: string, lang = Lang.TypeScript) {
+  return parse(lang, readFileSync(path, { encoding: "utf-8" })).root();
+}
+
+/**
+ * Patches the code from by applying the rule.
+ *
+ * This function is mainly for on off edits and tests,
+ * use `getRuleEdits` to apply multiple rules.
+ *
+ * @param code The source code
+ * @param rule The astgrep rule (yaml or NapiConfig)
+ * @param lang The language used by the source code
+ * @param lang Whether to apply the rule only once
+ * @returns The patched code
+ */
+export function patchCode(
+  code: string,
+  rule: string | RuleConfig,
+  { lang = Lang.TypeScript, once = false } = {},
+): string {
+  const node = parse(lang, code).root();
+  const { edits } = applyRule(rule, node, { once });
+  return node.commitEdits(edits);
+}
+
+export function createPatchCode(
+  rule: string | RuleConfig,
+  lang = Lang.TypeScript,
+): PatchCodeFn {
+  return async ({ code }) => patchCode(code, rule, { lang });
+}