@opennextjs/aws 3.5.2 → 3.5.4

package/dist/adapters/config/util.d.ts

@@ -2,6 +2,7 @@ import type { FunctionsConfigManifest, MiddlewareManifest, NextConfig, Prerender
 import type { PublicFiles } from "../../build";
 export declare function loadConfig(nextDir: string): NextConfig;
 export declare function loadBuildId(nextDir: string): string;
+export declare function loadPagesManifest(nextDir: string): any;
 export declare function loadHtmlPages(nextDir: string): string[];
 export declare function loadPublicAssets(openNextDir: string): PublicFiles;
 export declare function loadRoutesManifest(nextDir: string): {

package/dist/adapters/config/util.js

@@ -10,10 +10,13 @@ export function loadBuildId(nextDir) {
     const filePath = path.join(nextDir, "BUILD_ID");
     return fs.readFileSync(filePath, "utf-8").trim();
 }
-export function loadHtmlPages(nextDir) {
+export function loadPagesManifest(nextDir) {
     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) {
+    return Object.entries(loadPagesManifest(nextDir))
         .filter(([_, value]) => value.endsWith(".html"))
         .map(([key]) => key);
 }

package/dist/adapters/logger.js

@@ -1,4 +1,4 @@
-import { isOpenNextError } from "../utils/error";
+import { isOpenNextError } from "../utils/error.js";
 export function debug(...args) {
     if (globalThis.openNextDebug) {
         console.log(...args);

package/dist/build/compileCache.js

@@ -11,7 +11,7 @@ export function compileCache(options, format = "cjs") {
     const { config } = options;
     const ext = format === "cjs" ? "cjs" : "mjs";
     const outFile = path.join(options.buildDir, `cache.${ext}`);
-    const isAfter15 = buildHelper.compareSemver(options.nextVersion, "15.0.0") >= 0;
+    const isAfter15 = buildHelper.compareSemver(options.nextVersion, ">=", "15.0.0");
     buildHelper.esbuildSync({
         external: ["next", "styled-jsx", "react", "@aws-sdk/*"],
         entryPoints: [path.join(options.openNextDistDir, "adapters", "cache.js")],

package/dist/build/compileConfig.d.ts

@@ -6,10 +6,14 @@ import type { OpenNextConfig } from "../types/open-next.js";
  *
  * @param baseDir Directory where to look for the configuration.
  * @param openNextConfigPath Override the default configuration when provided. Relative to baseDir.
- * @param nodeExternals Externals for the Node.js compilation.
+ * @param nodeExternals Coma separated list of Externals for the Node.js compilation.
+ * @param compileEdge Force compiling for the edge runtime when true
  * @return The configuration and the build directory.
  */
-export declare function compileOpenNextConfig(baseDir: string, openNextConfigPath?: string, nodeExternals?: string): Promise<{
+export declare function compileOpenNextConfig(baseDir: string, openNextConfigPath?: string, { nodeExternals, compileEdge }?: {
+    nodeExternals?: string | undefined;
+    compileEdge?: boolean | undefined;
+}): Promise<{
     config: OpenNextConfig;
     buildDir: string;
 }>;

package/dist/build/compileConfig.js

@@ -11,13 +11,14 @@ import { validateConfig } from "./validateConfig.js";
  *
  * @param baseDir Directory where to look for the configuration.
  * @param openNextConfigPath Override the default configuration when provided. Relative to baseDir.
- * @param nodeExternals Externals for the Node.js compilation.
+ * @param nodeExternals Coma separated list of Externals for the Node.js compilation.
+ * @param compileEdge Force compiling for the edge runtime when true
  * @return The configuration and the build directory.
  */
-export async function compileOpenNextConfig(baseDir, openNextConfigPath, nodeExternals) {
+export async function compileOpenNextConfig(baseDir, openNextConfigPath, { nodeExternals = "", compileEdge = false } = {}) {
     const sourcePath = path.join(baseDir, openNextConfigPath ?? "open-next.config.ts");
     const buildDir = fs.mkdtempSync(path.join(os.tmpdir(), "open-next-tmp"));
-    let configPath = compileOpenNextConfigNode(sourcePath, buildDir, nodeExternals ? nodeExternals.split(",") : []);
+    let configPath = compileOpenNextConfigNode(sourcePath, buildDir, nodeExternals.split(","));
     // On Windows, we need to use file:// protocol to load the config file using import()
     if (process.platform === "win32")
         configPath = `file://${configPath}`;
@@ -31,12 +32,12 @@ export async function compileOpenNextConfig(baseDir, openNextConfigPath, nodeExt
     // If it does, we need to compile it with the edge runtime
     const usesEdgeRuntime = (config.middleware?.external && config.middleware.runtime !== "node") ||
         Object.values(config.functions || {}).some((fn) => fn.runtime === "edge");
-    if (!usesEdgeRuntime) {
-        logger.debug("No edge runtime found in the open-next.config.ts. Using default config.");
-        //Nothing to do here
+    if (usesEdgeRuntime || compileEdge) {
+        compileOpenNextConfigEdge(sourcePath, buildDir, config.edgeExternals ?? []);
     }
     else {
-        compileOpenNextConfigEdge(sourcePath, buildDir, config.edgeExternals ?? []);
+        // Skip compiling for the edge runtime.
+        logger.debug("No edge runtime found in the open-next.config.ts. Using default config.");
     }
     return { config, buildDir };
 }

package/dist/build/constant.d.ts

@@ -1 +1,2 @@
 export declare const MIDDLEWARE_TRACE_FILE = "server/middleware.js.nft.json";
+export declare const INSTRUMENTATION_TRACE_FILE = "server/instrumentation.js.nft.json";

package/dist/build/constant.js

@@ -1,2 +1,3 @@
 //TODO: Move all other manifest path here as well
 export const MIDDLEWARE_TRACE_FILE = "server/middleware.js.nft.json";
+export const INSTRUMENTATION_TRACE_FILE = "server/instrumentation.js.nft.json";

package/dist/build/copyTracedFiles.d.ts

@@ -6,5 +6,25 @@ interface CopyTracedFilesOptions {
     bundledNextServer: boolean;
     skipServerFiles?: boolean;
 }
-export declare function copyTracedFiles({ buildOutputPath, packagePath, outputDir, routes, bundledNextServer, skipServerFiles, }: CopyTracedFilesOptions): Promise<void>;
+export declare function getManifests(nextDir: string): {
+    buildId: string;
+    config: import("../types/next-types.js").NextConfig;
+    prerenderManifest: import("../types/next-types.js").PrerenderManifest;
+    pagesManifest: any;
+    appPathsManifest: Record<string, string>;
+    middlewareManifest: import("../types/next-types.js").MiddlewareManifest;
+    functionsConfigManifest: import("../types/next-types.js").FunctionsConfigManifest;
+};
+export declare function copyTracedFiles({ buildOutputPath, packagePath, outputDir, routes, bundledNextServer, skipServerFiles, }: CopyTracedFilesOptions): Promise<{
+    tracedFiles: string[];
+    manifests: {
+        buildId: string;
+        config: import("../types/next-types.js").NextConfig;
+        prerenderManifest: import("../types/next-types.js").PrerenderManifest;
+        pagesManifest: any;
+        appPathsManifest: Record<string, string>;
+        middlewareManifest: import("../types/next-types.js").MiddlewareManifest;
+        functionsConfigManifest: import("../types/next-types.js").FunctionsConfigManifest;
+    };
+}>;
 export {};

package/dist/build/copyTracedFiles.js

@@ -1,10 +1,10 @@
 import url from "node:url";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, readlinkSync, statSync, symlinkSync, writeFileSync, } from "node:fs";
 import path from "node:path";
-import { loadConfig, loadPrerenderManifest } from "../adapters/config/util.js";
+import { loadAppPathsManifest, loadBuildId, loadConfig, loadFunctionsConfigManifest, loadMiddlewareManifest, loadPagesManifest, loadPrerenderManifest, } from "../adapters/config/util.js";
 import { getCrossPlatformPathRegex } from "../utils/regex.js";
 import logger from "../logger.js";
-import { MIDDLEWARE_TRACE_FILE } from "./constant.js";
+import { INSTRUMENTATION_TRACE_FILE, MIDDLEWARE_TRACE_FILE, } from "./constant.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 //TODO: we need to figure which packages we could safely remove
 const EXCLUDED_PACKAGES = [
@@ -22,6 +22,17 @@ function copyPatchFile(outputDir) {
     const outputPatchFile = path.join(outputDir, "patchedAsyncStorage.cjs");
     copyFileSync(patchFile, outputPatchFile);
 }
+export function getManifests(nextDir) {
+    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, packagePath, outputDir, routes, bundledNextServer, skipServerFiles, }) {
     const tsStart = Date.now();
@@ -44,12 +55,12 @@ export async function copyTracedFiles({ buildOutputPath, packagePath, outputDir,
         });
     }
     // create directory for pages
-    if (existsSync(path.join(standaloneServerDir, "pages"))) {
+    if (existsSync(path.join(standaloneNextDir, "server/pages"))) {
         mkdirSync(path.join(outputNextDir, "server/pages"), {
             recursive: true,
         });
     }
-    if (existsSync(path.join(standaloneServerDir, "app"))) {
+    if (existsSync(path.join(standaloneNextDir, "server/app"))) {
         mkdirSync(path.join(outputNextDir, "server/app"), {
             recursive: true,
         });
@@ -100,10 +111,18 @@ File ${fullFilePath} does not exist
             }
         }
     };
+    // Check for instrumentation trace file
+    if (existsSync(path.join(dotNextDir, INSTRUMENTATION_TRACE_FILE))) {
+        // We still need to copy the nft.json file so that computeCopyFilesForPage doesn't throw
+        copyFileSync(path.join(dotNextDir, INSTRUMENTATION_TRACE_FILE), path.join(standaloneNextDir, INSTRUMENTATION_TRACE_FILE));
+        computeCopyFilesForPage("instrumentation");
+        logger.debug("Adding instrumentation trace files");
+    }
     if (existsSync(path.join(dotNextDir, MIDDLEWARE_TRACE_FILE))) {
         // We still need to copy the nft.json file so that computeCopyFilesForPage doesn't throw
         copyFileSync(path.join(dotNextDir, MIDDLEWARE_TRACE_FILE), path.join(standaloneNextDir, MIDDLEWARE_TRACE_FILE));
         computeCopyFilesForPage("middleware");
+        logger.debug("Adding node middleware trace files");
     }
     const hasPageDir = routes.some((route) => route.startsWith("pages/"));
     const hasAppDir = routes.some((route) => route.startsWith("app/"));
@@ -191,7 +210,7 @@ File ${fullFilePath} does not exist
     // Maybe even move this to s3 directly
     if (hasPageDir) {
         // First we get truly static files - i.e. pages without getStaticProps
-        const staticFiles = Object.values(JSON.parse(readFileSync(path.join(standaloneServerDir, "pages-manifest.json"), "utf8")));
+        const staticFiles = Object.values(loadPagesManifest(standaloneNextDir));
         // Then we need to get all fallback: true dynamic routes html
         const prerenderManifest = loadPrerenderManifest(standaloneNextDir);
         const config = loadConfig(standaloneNextDir);
@@ -213,4 +232,8 @@ File ${fullFilePath} does not exist
             .forEach((file) => copyStaticFile(`server/${file}`));
     }
     logger.debug("copyTracedFiles:", Date.now() - tsStart, "ms");
+    return {
+        tracedFiles: Array.from(filesToCopy.values()),
+        manifests: getManifests(standaloneNextDir),
+    };
 }

package/dist/build/createImageOptimizationBundle.js

@@ -26,7 +26,7 @@ export async function createImageOptimizationBundle(options) {
             },
         }),
     ];
-    if (buildHelper.compareSemver(options.nextVersion, "14.1.1") >= 0) {
+    if (buildHelper.compareSemver(options.nextVersion, ">=", "14.1.1")) {
         plugins.push(openNextReplacementPlugin({
             name: "opennext-14.1.1-image-optimization",
             target: getCrossPlatformPathRegex("plugins/image-optimization/image-optimization.js"),

package/dist/build/createMiddleware.js

@@ -58,6 +58,7 @@ export async function createMiddleware(options, { forceOnlyBuildOnce = false } =
             outfile: path.join(options.buildDir, "middleware.mjs"),
             middlewareInfo: edgeMiddlewareInfo,
             options,
+            overrides: config.default.override,
             onlyBuildOnce: true,
             name: "middleware",
         });

package/dist/build/createServerBundle.d.ts

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

package/dist/build/createServerBundle.js

@@ -1,17 +1,22 @@
 import fs from "node:fs";
 import path from "node:path";
+import { loadMiddlewareManifest } from "../adapters/config/util.js";
 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";
 import { bundleNextServer } from "./bundleNextServer.js";
 import { compileCache } from "./compileCache.js";
 import { copyTracedFiles } from "./copyTracedFiles.js";
-import { generateEdgeBundle } from "./edge/createEdgeBundle.js";
+import { copyMiddlewareResources, generateEdgeBundle, } from "./edge/createEdgeBundle.js";
 import * as buildHelper from "./helper.js";
 import { installDependencies } from "./installDeps.js";
-export async function createServerBundle(options) {
+import { applyCodePatches } from "./patch/codePatcher.js";
+import { patchFetchCacheForISR, patchUnstableCacheForISR, } from "./patch/patchFetchCacheISR.js";
+import { patchFetchCacheSetMissingWaitUntil } from "./patch/patchFetchCacheWaitUntil.js";
+export async function createServerBundle(options, codeCustomization) {
     const { config } = options;
     const foundRoutes = new Set();
     // Get all functions to build
@@ -29,7 +34,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
@@ -67,7 +72,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
@@ -78,45 +83,60 @@ async function generateBundle(name, options, fnOptions) {
     //       `.next/standalone/package/path` (ie. `.next`, `server.js`).
     //       We need to output the handler file inside the package path.
     const packagePath = buildHelper.getPackagePath(options);
-    fs.mkdirSync(path.join(outputPath, packagePath), { recursive: true });
+    const outPackagePath = path.join(outputPath, packagePath);
+    fs.mkdirSync(outPackagePath, { recursive: true });
     const ext = fnOptions.runtime === "deno" ? "mjs" : "cjs";
-    fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outputPath, packagePath, "cache.cjs"));
+    fs.copyFileSync(path.join(options.buildDir, `cache.${ext}`), path.join(outPackagePath, "cache.cjs"));
     if (fnOptions.runtime === "deno") {
         addDenoJson(outputPath, packagePath);
     }
     // Bundle next server if necessary
     const isBundled = fnOptions.experimentalBundledNextServer ?? false;
     if (isBundled) {
-        await bundleNextServer(path.join(outputPath, packagePath), appPath, {
+        await bundleNextServer(outPackagePath, appPath, {
             minify: options.minify,
         });
     }
     // Copy middleware
     if (!config.middleware?.external) {
-        fs.copyFileSync(path.join(options.buildDir, "middleware.mjs"), path.join(outputPath, packagePath, "middleware.mjs"));
+        fs.copyFileSync(path.join(options.buildDir, "middleware.mjs"), path.join(outPackagePath, "middleware.mjs"));
+        const middlewareManifest = loadMiddlewareManifest(path.join(options.appBuildOutputPath, ".next"));
+        copyMiddlewareResources(options, middlewareManifest.middleware["/"], outPackagePath);
     }
     // Copy open-next.config.mjs
-    buildHelper.copyOpenNextConfig(options.buildDir, path.join(outputPath, packagePath));
+    buildHelper.copyOpenNextConfig(options.buildDir, outPackagePath);
     // 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,
+        ...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 updater = new ContentUpdater(options);
+    const additionalPlugins = codeCustomization?.additionalPlugins
+        ? codeCustomization.additionalPlugins(updater)
+        : [];
     const plugins = [
         openNextReplacementPlugin({
             name: `requestHandlerOverride ${name}`,
@@ -124,6 +144,7 @@ async function generateBundle(name, options, fnOptions) {
             deletes: [
                 ...(disableNextPrebundledReact ? ["applyNextjsPrebundledReact"] : []),
                 ...(disableRouting ? ["withRouting"] : []),
+                ...(isAfter142 ? ["patchAsyncStorage"] : []),
             ],
         }),
         openNextReplacementPlugin({
@@ -141,6 +162,9 @@ async function generateBundle(name, options, fnOptions) {
             fnName: name,
             overrides,
         }),
+        ...additionalPlugins,
+        // The content updater plugin must be the last plugin
+        updater.plugin,
     ];
     const outfileExt = fnOptions.runtime === "deno" ? "ts" : "mjs";
     await buildHelper.esbuildAsync({
@@ -213,7 +237,7 @@ function addMonorepoEntrypoint(outputPath, packagePath) {
     //       that re-exports the real handler.
     // Always use posix path for import path
     const packagePosixPath = packagePath.split(path.sep).join(path.posix.sep);
-    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export * from "./${packagePosixPath}/index.mjs";`);
+    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export { handler } from "./${packagePosixPath}/index.mjs";`);
 }
 async function minifyServerBundle(outputDir) {
     logger.info("Minimizing server function...");

package/dist/build/edge/createEdgeBundle.d.ts

@@ -1,6 +1,8 @@
+import { type Plugin } from "esbuild";
 import type { MiddlewareInfo } from "../../types/next-types";
 import type { IncludedConverter, IncludedOriginResolver, LazyLoadedOverride, OverrideOptions, SplittedFunctionOptions } from "../../types/open-next";
 import type { OriginResolver } from "../../types/overrides.js";
+import { ContentUpdater } from "../../plugins/content-updater.js";
 import { type BuildOptions } from "../helper.js";
 type Override = OverrideOptions & {
     originResolver?: LazyLoadedOverride<OriginResolver> | IncludedOriginResolver;
@@ -17,7 +19,12 @@ interface BuildEdgeBundleOptions {
     additionalExternals?: string[];
     onlyBuildOnce?: boolean;
     name: string;
+    additionalPlugins?: (contentUpdater: ContentUpdater) => Plugin[];
 }
-export declare function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, options, defaultConverter, overrides, additionalInject, includeCache, additionalExternals, onlyBuildOnce, name, }: BuildEdgeBundleOptions): Promise<void>;
-export declare function generateEdgeBundle(name: string, options: BuildOptions, fnOptions: SplittedFunctionOptions): Promise<void>;
+export declare function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, options, defaultConverter, overrides, additionalInject, includeCache, additionalExternals, onlyBuildOnce, name, additionalPlugins: additionalPluginsFn, }: BuildEdgeBundleOptions): Promise<void>;
+export declare function generateEdgeBundle(name: string, options: BuildOptions, fnOptions: SplittedFunctionOptions, additionalPlugins?: (contentUpdater: ContentUpdater) => Plugin[]): Promise<void>;
+/**
+ * Copy wasm files and assets into the destDir.
+ */
+export declare function copyMiddlewareResources(options: BuildOptions, middlewareInfo: MiddlewareInfo | undefined, destDir: string): void;
 export {};

package/dist/build/edge/createEdgeBundle.js

@@ -4,6 +4,7 @@ import path from "node:path";
 import { build } from "esbuild";
 import { loadMiddlewareManifest } from "../../adapters/config/util.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";
@@ -11,13 +12,17 @@ import { openNextResolvePlugin } from "../../plugins/resolve.js";
 import { getCrossPlatformPathRegex } from "../../utils/regex.js";
 import { isEdgeRuntime } from "../helper.js";
 import { copyOpenNextConfig, esbuildAsync } from "../helper.js";
-export async function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, options, defaultConverter, overrides, additionalInject, includeCache, additionalExternals, onlyBuildOnce, name, }) {
-    const isInCloudfare = await isEdgeRuntime(overrides);
+export async function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, options, defaultConverter, overrides, additionalInject, includeCache, additionalExternals, onlyBuildOnce, name, additionalPlugins: additionalPluginsFn, }) {
+    const isInCloudflare = await isEdgeRuntime(overrides);
     function override(target) {
         return typeof overrides?.[target] === "string"
             ? overrides[target]
             : undefined;
     }
+    const contentUpdater = new ContentUpdater(options);
+    const additionalPlugins = additionalPluginsFn
+        ? additionalPluginsFn(contentUpdater)
+        : [];
     await esbuildAsync({
         entryPoints: [entrypoint],
         bundle: true,
@@ -51,8 +56,11 @@ export async function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, opt
             openNextEdgePlugins({
                 middlewareInfo,
                 nextDir: path.join(options.appBuildOutputPath, ".next"),
-                isInCloudfare,
+                isInCloudflare,
             }),
+            ...additionalPlugins,
+            // The content updater plugin must be the last plugin
+            contentUpdater.plugin,
         ],
         treeShaking: true,
         alias: {
@@ -89,7 +97,7 @@ Object.defineProperty = function(o, p, a) {
   return defaultDefineProperty(o, p, a);
 };
 
-  ${isInCloudfare
+  ${isInCloudflare
                 ? ""
                 : `
   const require = (await import("node:module")).createRequire(import.meta.url);
@@ -117,7 +125,7 @@ Object.defineProperty = function(o, p, a) {
         });
     }
 }
-export async function generateEdgeBundle(name, options, fnOptions) {
+export async function generateEdgeBundle(name, options, fnOptions, additionalPlugins = () => []) {
     logger.info(`Generating edge bundle for: ${name}`);
     const buildOutputDotNextDir = path.join(options.appBuildOutputPath, ".next");
     // Create output folder
@@ -133,18 +141,7 @@ export async function generateEdgeBundle(name, options, fnOptions) {
         throw new Error("Only one function is supported for now");
     }
     const middlewareInfo = functions[0];
-    //Copy wasm files
-    const wasmFiles = middlewareInfo.wasm;
-    mkdirSync(path.join(outputDir, "wasm"), { recursive: true });
-    for (const wasmFile of wasmFiles) {
-        fs.copyFileSync(path.join(buildOutputDotNextDir, wasmFile.filePath), path.join(outputDir, `wasm/${wasmFile.name}.wasm`));
-    }
-    // Copy assets
-    const assets = middlewareInfo.assets;
-    mkdirSync(path.join(outputDir, "assets"), { recursive: true });
-    for (const asset of assets) {
-        fs.copyFileSync(path.join(buildOutputDotNextDir, asset.filePath), path.join(outputDir, `assets/${asset.name}`));
-    }
+    copyMiddlewareResources(options, middlewareInfo, outputDir);
     await buildEdgeBundle({
         middlewareInfo,
         entrypoint: path.join(options.openNextDistDir, "adapters/edge-adapter.js"),
@@ -153,5 +150,19 @@ export async function generateEdgeBundle(name, options, fnOptions) {
         overrides: fnOptions.override,
         additionalExternals: options.config.edgeExternals,
         name,
+        additionalPlugins,
     });
 }
+/**
+ * Copy wasm files and assets into the destDir.
+ */
+export function copyMiddlewareResources(options, middlewareInfo, destDir) {
+    mkdirSync(path.join(destDir, "wasm"), { recursive: true });
+    for (const file of middlewareInfo?.wasm ?? []) {
+        fs.copyFileSync(path.join(options.appBuildOutputPath, ".next", file.filePath), path.join(destDir, `wasm/${file.name}.wasm`));
+    }
+    mkdirSync(path.join(destDir, "assets"), { recursive: true });
+    for (const file of middlewareInfo?.assets ?? []) {
+        fs.copyFileSync(path.join(options.appBuildOutputPath, ".next", file.filePath), path.join(destDir, `assets/${file.name}`));
+    }
+}

package/dist/build/helper.d.ts

@@ -51,15 +51,16 @@ export declare function getHtmlPages(dotNextPath: string): Set<string>;
 export declare function getBuildId(options: BuildOptions): string;
 export declare function getOpenNextVersion(): string;
 export declare function getNextVersion(appPath: string): string;
+export type SemverOp = "=" | ">=" | "<=" | ">" | "<";
 /**
  * Compare two semver versions.
  *
  * @param v1 - First version. Can be "latest", otherwise it should be a valid semver version in the format of `major.minor.patch`. Usually is the next version from the package.json without canary suffix. If minor or patch are missing, they are considered 0.
  * @param v2 - Second version. Should not be "latest", it should be a valid semver version in the format of `major.minor.patch`. If minor or patch are missing, they are considered 0.
  * @example
- * compareSemver("1.0.0", "1.0.0") // 0
+ *     compareSemver("2.0.0", ">=", "1.0.0") === true
  */
-export declare function compareSemver(v1: string, v2: string): number;
+export declare function compareSemver(v1: string, operator: SemverOp, v2: string): boolean;
 export declare function copyOpenNextConfig(inputDir: string, outputDir: string, isEdge?: boolean): void;
 export declare function copyEnvFile(appPath: string, packagePath: string, outputPath: string): void;
 /**

package/dist/build/helper.js

@@ -213,29 +213,54 @@ export function getNextVersion(appPath) {
  * @param v1 - First version. Can be "latest", otherwise it should be a valid semver version in the format of `major.minor.patch`. Usually is the next version from the package.json without canary suffix. If minor or patch are missing, they are considered 0.
  * @param v2 - Second version. Should not be "latest", it should be a valid semver version in the format of `major.minor.patch`. If minor or patch are missing, they are considered 0.
  * @example
- * compareSemver("1.0.0", "1.0.0") // 0
+ *     compareSemver("2.0.0", ">=", "1.0.0") === true
  */
-export function compareSemver(v1, v2) {
-    if (v1 === "latest")
-        return 1;
-    if (/^[^\d]/.test(v1)) {
-        // biome-ignore lint/style/noParameterAssign:
-        v1 = v1.substring(1);
+export function compareSemver(v1, operator, v2) {
+    // - = 0 when versions are equal
+    // - > 0 if v1 > v2
+    // - < 0 if v2 > v1
+    let versionDiff = 0;
+    if (v1 === "latest") {
+        versionDiff = 1;
     }
-    if (/^[^\d]/.test(v2)) {
-        // biome-ignore lint/style/noParameterAssign:
-        v2 = v2.substring(1);
+    else {
+        if (/^[^\d]/.test(v1)) {
+            // biome-ignore lint/style/noParameterAssign:
+            v1 = v1.substring(1);
+        }
+        if (/^[^\d]/.test(v2)) {
+            // biome-ignore lint/style/noParameterAssign:
+            v2 = v2.substring(1);
+        }
+        const [major1, minor1 = 0, patch1 = 0] = v1.split(".").map(Number);
+        const [major2, minor2 = 0, patch2 = 0] = v2.split(".").map(Number);
+        if (Number.isNaN(major1) || Number.isNaN(major2)) {
+            throw new Error("The major version is required.");
+        }
+        if (major1 !== major2) {
+            versionDiff = major1 - major2;
+        }
+        else if (minor1 !== minor2) {
+            versionDiff = minor1 - minor2;
+        }
+        else if (patch1 !== patch2) {
+            versionDiff = patch1 - patch2;
+        }
     }
-    const [major1, minor1 = 0, patch1 = 0] = v1.split(".").map(Number);
-    const [major2, minor2 = 0, patch2 = 0] = v2.split(".").map(Number);
-    if (Number.isNaN(major1) || Number.isNaN(major2)) {
-        throw new Error("The major version is required.");
+    switch (operator) {
+        case "=":
+            return versionDiff === 0;
+        case ">=":
+            return versionDiff >= 0;
+        case "<=":
+            return versionDiff <= 0;
+        case ">":
+            return versionDiff > 0;
+        case "<":
+            return versionDiff < 0;
+        default:
+            throw new Error(`Unsupported operator: ${operator}`);
     }
-    if (major1 !== major2)
-        return major1 - major2;
-    if (minor1 !== minor2)
-        return minor1 - minor2;
-    return patch1 - patch2;
 }
 export function copyOpenNextConfig(inputDir, outputDir, isEdge = false) {
     // Copy open-next.config.mjs
@@ -292,7 +317,7 @@ export async function isEdgeRuntime(overrides) {
         return false;
     }
     if (typeof overrides.wrapper === "string") {
-        return ["cloudflare-edge", "cloudflare"].includes(overrides.wrapper);
+        return ["cloudflare-edge", "cloudflare", "cloudflare-node"].includes(overrides.wrapper);
     }
     return (await overrides?.wrapper?.())?.edgeRuntime;
 }