review fix

Author: conico974

packages/open-next/src/build/createServerBundle.ts

@@ -20,10 +20,10 @@ import { type CodePatcher, applyCodePatches } from "./patch/codePatcher.js";
 
 interface CodeCustomization {
   // These patches are meant to apply on user and next generated code
-  additionalCodePatches: CodePatcher[];
+  additionalCodePatches?: CodePatcher[];
   // These plugins are meant to apply during the esbuild bundling process.
   // This will only apply to OpenNext code.
-  additionalPlugins: (contentUpdater: ContentUpdater) => Plugin[];
+  additionalPlugins?: (contentUpdater: ContentUpdater) => Plugin[];
 }
 
 export async function createServerBundle(
@@ -167,7 +167,7 @@ async function generateBundle(
   // Copy env files
   buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
 
-  // Copy all necessary traced files{
+  // Copy all necessary traced files
   const { tracedFiles, manifests } = await copyTracedFiles({
     buildOutputPath: appBuildOutputPath,
     packagePath,
@@ -179,15 +179,6 @@ async function generateBundle(
   const additionalCodePatches = codeCustomization?.additionalCodePatches ?? [];
 
   await applyCodePatches(options, Array.from(tracedFiles), manifests, [
-    // TODO: create real code patchers here
-    {
-      name: "fakePatchChunks",
-      pathFilter: /chunks\/\d+\.js/,
-      patchCode: async ({ code, manifests }) => {
-        console.log(manifests);
-        return `console.log("patched chunk");\n${code}`;
-      },
-    },
     ...additionalCodePatches,
   ]);
 
@@ -211,7 +202,9 @@ async function generateBundle(
 
   const updater = new ContentUpdater(options);
 
-  const additionalPlugins = codeCustomization?.additionalPlugins(updater) ?? [];
+  const additionalPlugins = codeCustomization?.additionalPlugins
+    ? codeCustomization.additionalPlugins(updater)
+    : [];
 
   const plugins = [
     openNextReplacementPlugin({
@@ -239,6 +232,7 @@ async function generateBundle(
       overrides,
     }),
     ...additionalPlugins,
+    // The content updater plugin must be the last plugin
     updater.plugin,
   ];
 

packages/open-next/src/build/edge/createEdgeBundle.ts

@@ -104,6 +104,7 @@ export async function buildEdgeBundle({
           isInCloudfare,
         }),
         ...additionalPlugins,
+        // The content updater plugin must be the last plugin
         contentUpdater.plugin,
       ],
       treeShaking: true,

packages/open-next/src/build/patch/codePatcher.ts

@@ -4,12 +4,18 @@ import * as buildHelper from "../helper.js";
 
 // Either before or after should be provided, otherwise just use the field directly
 export interface VersionedField<T> {
-  // The version before which the field should be used
+  /**
+   * The version before which the field should be used
+   * If the version is less than or equal to this, the field will be used
+   */
   before?:
     | `${number}`
     | `${number}.${number}`
     | `${number}.${number}.${number}`;
-  // The version after which the field should be used
+  /**
+   * The version after which the field should be used
+   * If the version is greater than this, the field will be used
+   */
   after?: `${number}` | `${number}.${number}` | `${number}.${number}.${number}`;
   field: T;
 }
@@ -67,7 +73,7 @@ export async function applyCodePatches(
   codePatcher: CodePatcher[],
 ) {
   const nextVersion = buildOptions.nextVersion;
-  console.time("Applying code patches");
+  logger.time("Applying code patches");
   await Promise.all(
     tracedFiles.map(async (filePath) => {
       // We check the filename against the filter to see if we should apply the patch
@@ -120,5 +126,5 @@ export async function applyCodePatches(
       await fs.writeFile(filePath, patchedContent);
     }),
   );
-  console.timeEnd("Applying code patches");
+  logger.timeEnd("Applying code patches");
 }

packages/open-next/src/logger.ts

@@ -13,4 +13,6 @@ export default {
   info: console.log,
   warn: (...args: any[]) => console.warn(chalk.yellow("WARN"), ...args),
   error: (...args: any[]) => console.error(chalk.red("ERROR"), ...args),
+  time: console.time,
+  timeEnd: console.timeEnd,
 };

packages/open-next/src/plugins/content-updater.ts

@@ -1,5 +1,4 @@
 /**
- * Mostly copied from the cloudflare adapter
  * ESBuild stops calling `onLoad` hooks after the first hook returns an updated content.
  *
  * The updater allows multiple plugins to update the content.