@opennextjs/cloudflare 0.3.10 → 0.4.0

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

@@ -0,0 +1,23 @@
+import { SgNode } from "@ast-grep/napi";
+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.
+ *
+ * @param root Root node.
+ * @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>>[];
+};
+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";
+/**
+ * Patches the default font fetching to use a .bin import.
+ *
+ * @param root Root node.
+ * @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>>[];
+};

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

@@ -0,0 +1,58 @@
+import { applyRule } from "./util.js";
+export const vercelOgImportRule = `
+rule:
+  pattern: $NODE
+  kind: string
+  regex: "next/dist/compiled/@vercel/og/index\\\\.node\\\\.js"
+inside:
+  kind: arguments
+  inside:
+    kind: call_expression
+    stopBy: end
+    has:
+      field: function
+      regex: "import"
+
+fix: |-
+  "next/dist/compiled/@vercel/og/index.edge.js"
+`;
+/**
+ * Patches Node.js imports for the library to be Edge imports.
+ *
+ * @param root Root node.
+ * @returns Results of applying the rule.
+ */
+export function patchVercelOgImport(root) {
+    return applyRule(vercelOgImportRule, root);
+}
+export const vercelOgFallbackFontRule = `
+rule:
+  kind: variable_declaration
+  all:
+    - has:
+        kind: variable_declarator
+        has:
+          kind: identifier
+          regex: ^fallbackFont$
+    - has:
+        kind: call_expression
+        pattern: fetch(new URL("$PATH", $$$REST))
+        stopBy: end
+
+fix: |-
+  async function getFallbackFont() {
+    // .bin is used so that a loader does not need to be configured for .ttf files
+    return (await import("$PATH.bin")).default;
+  }
+
+  var fallbackFont = getFallbackFont();
+`;
+/**
+ * Patches the default font fetching to use a .bin import.
+ *
+ * @param root Root node.
+ * @returns Results of applying the rule.
+ */
+export function patchVercelOgFallbackFont(root) {
+    return applyRule(vercelOgFallbackFontRule, root);
+}

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,22 @@
+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", () => {
+        const code = `e.exports=import("next/dist/compiled/@vercel/og/index.node.js")`;
+        expect(patchCode(code, vercelOgImportRule)).toMatchInlineSnapshot(`"e.exports=import("next/dist/compiled/@vercel/og/index.edge.js")"`);
+    });
+});
+describe("vercelOgFallbackFontRule", () => {
+    it("should replace a fetch call for a font with an import", () => {
+        const code = `var fallbackFont = fetch(new URL("./noto-sans-v27-latin-regular.ttf", import.meta.url)).then((res) => res.arrayBuffer());`;
+        expect(patchCode(code, vercelOgFallbackFontRule)).toMatchInlineSnapshot(`
+      "async function getFallbackFont() {
+        // .bin is used so that a loader does not need to be configured for .ttf files
+        return (await import("./noto-sans-v27-latin-regular.ttf.bin")).default;
+      }
+
+      var fallbackFont = getFallbackFont();"
+    `);
+    });
+});

package/dist/cli/build/patches/investigated/copy-package-cli-files.d.ts

@@ -1,6 +1,7 @@
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
-import { Config } from "../../../config.js";
 /**
- * Copies the template files present in the cloudflare adapter package into the standalone node_modules folder
+ * Copies
+ * - the template files present in the cloudflare adapter package to `.open-next/cloudflare-templates`
+ * - `worker.js` to `.open-next/`
  */
-export declare function copyPackageCliFiles(packageDistDir: string, config: Config, openNextOptions: BuildOptions): void;
+export declare function copyPackageCliFiles(packageDistDir: string, buildOpts: BuildOptions): void;

package/dist/cli/build/patches/investigated/copy-package-cli-files.js

@@ -2,12 +2,15 @@ import fs from "node:fs";
 import path from "node:path";
 import { getOutputWorkerPath } from "../../bundle-server.js";
 /**
- * Copies the template files present in the cloudflare adapter package into the standalone node_modules folder
+ * Copies
+ * - the template files present in the cloudflare adapter package to `.open-next/cloudflare-templates`
+ * - `worker.js` to `.open-next/`
  */
-export function copyPackageCliFiles(packageDistDir, config, openNextOptions) {
+export function copyPackageCliFiles(packageDistDir, buildOpts) {
     console.log("# copyPackageTemplateFiles");
-    const sourceDir = path.join(packageDistDir, "cli");
-    const destinationDir = path.join(config.paths.internal.package, "cli");
+    const sourceDir = path.join(packageDistDir, "cli/templates");
+    const destinationDir = path.join(buildOpts.outputDir, "cloudflare-templates");
+    fs.mkdirSync(destinationDir, { recursive: true });
     fs.cpSync(sourceDir, destinationDir, { recursive: true });
-    fs.copyFileSync(path.join(packageDistDir, "cli", "templates", "worker.js"), getOutputWorkerPath(openNextOptions));
+    fs.copyFileSync(path.join(packageDistDir, "cli/templates/worker.js"), getOutputWorkerPath(buildOpts));
 }

package/dist/cli/build/patches/investigated/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./copy-package-cli-files.js";
 export * from "./patch-cache.js";
 export * from "./patch-require.js";
+export * from "./patch-vercel-og-library.js";
 export * from "./update-webpack-chunks-file/index.js";

package/dist/cli/build/patches/investigated/index.js

@@ -1,4 +1,5 @@
 export * from "./copy-package-cli-files.js";
 export * from "./patch-cache.js";
 export * from "./patch-require.js";
+export * from "./patch-vercel-og-library.js";
 export * from "./update-webpack-chunks-file/index.js";

package/dist/cli/build/patches/investigated/patch-cache.d.ts

@@ -1,4 +1,4 @@
-import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 /**
  * Sets up the OpenNext cache handler in a Next.js build.
  *
@@ -10,4 +10,4 @@ import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
  * build-time. Therefore, we have to manually override the default way that the cache handler is
  * instantiated with a dynamic require that uses a string literal for the path.
  */
-export declare function patchCache(code: string, openNextOptions: BuildOptions): Promise<string>;
+export declare function patchCache(code: string, buildOpts: BuildOptions): Promise<string>;

package/dist/cli/build/patches/investigated/patch-cache.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { normalizePath } from "../../utils/index.js";
 /**
  * Sets up the OpenNext cache handler in a Next.js build.
@@ -11,13 +12,13 @@ import { normalizePath } from "../../utils/index.js";
  * build-time. Therefore, we have to manually override the default way that the cache handler is
  * instantiated with a dynamic require that uses a string literal for the path.
  */
-export async function patchCache(code, openNextOptions) {
-    const { appBuildOutputPath, outputDir, monorepoRoot } = openNextOptions;
+export async function patchCache(code, buildOpts) {
+    const { outputDir } = buildOpts;
     // TODO: switch to cache.mjs
-    const outputPath = path.join(outputDir, "server-functions", "default");
-    const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
-    const cacheFile = path.join(outputPath, packagePath, "cache.cjs");
-    return code.replace("const { cacheHandler } = this.nextConfig;", `const cacheHandler = null;
+    const outputPath = path.join(outputDir, "server-functions/default");
+    const cacheFile = path.join(outputPath, getPackagePath(buildOpts), "cache.cjs");
+    return code.replace("const { cacheHandler } = this.nextConfig;", `
+const cacheHandler = null;
 CacheHandler = require('${normalizePath(cacheFile)}').default;
 `);
 }

package/dist/cli/build/patches/investigated/patch-require.d.ts

@@ -1,7 +1,4 @@
 /**
- * ESBuild does not support CJS format
- * See https://github.com/evanw/esbuild/issues/1921 and linked issues
- * Some of the solutions are based on `module.createRequire()` not implemented in workerd.
- * James on Aug 29: `module.createRequire()` is planned.
+ * Replaces webpack `__require` with actual `require`
  */
 export declare function patchRequire(code: string): string;

package/dist/cli/build/patches/investigated/patch-require.js

@@ -1,8 +1,5 @@
 /**
- * ESBuild does not support CJS format
- * See https://github.com/evanw/esbuild/issues/1921 and linked issues
- * Some of the solutions are based on `module.createRequire()` not implemented in workerd.
- * James on Aug 29: `module.createRequire()` is planned.
+ * Replaces webpack `__require` with actual `require`
  */
 export function patchRequire(code) {
     return code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");

package/dist/cli/build/patches/investigated/patch-vercel-og-library.d.ts

@@ -0,0 +1,7 @@
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+/**
+ * Patches the usage of @vercel/og to be compatible with Cloudflare Workers.
+ *
+ * @param buildOpts Build options.
+ */
+export declare function patchVercelOgLibrary(buildOpts: BuildOptions): void;

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

@@ -0,0 +1,39 @@
+import { copyFileSync, existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { globSync } from "glob";
+import { parseFile } from "../ast/util.js";
+import { patchVercelOgFallbackFont, patchVercelOgImport } from "../ast/vercel-og.js";
+/**
+ * Patches the usage of @vercel/og to be compatible with Cloudflare Workers.
+ *
+ * @param buildOpts Build options.
+ */
+export function patchVercelOgLibrary(buildOpts) {
+    const { appBuildOutputPath, outputDir } = buildOpts;
+    const packagePath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts));
+    for (const traceInfoPath of globSync(path.join(appBuildOutputPath, ".next/server/**/*.nft.json"))) {
+        const traceInfo = JSON.parse(readFileSync(traceInfoPath, { encoding: "utf8" }));
+        const tracedNodePath = traceInfo.files.find((p) => p.endsWith("@vercel/og/index.node.js"));
+        if (!tracedNodePath)
+            continue;
+        const outputDir = path.join(packagePath, "node_modules/next/dist/compiled/@vercel/og");
+        const outputEdgePath = path.join(outputDir, "index.edge.js");
+        // Ensure the edge version is available in the OpenNext node_modules.
+        if (!existsSync(outputEdgePath)) {
+            const tracedEdgePath = path.join(path.dirname(traceInfoPath), tracedNodePath.replace("index.node.js", "index.edge.js"));
+            copyFileSync(tracedEdgePath, outputEdgePath);
+            // Change font fetches in the library to use imports.
+            const node = parseFile(outputEdgePath);
+            const { edits, matches } = patchVercelOgFallbackFont(node);
+            writeFileSync(outputEdgePath, node.commitEdits(edits));
+            const fontFileName = matches[0].getMatch("PATH").text();
+            renameSync(path.join(outputDir, fontFileName), path.join(outputDir, `${fontFileName}.bin`));
+        }
+        // Change node imports for the library to edge imports.
+        const routeFilePath = traceInfoPath.replace(appBuildOutputPath, packagePath).replace(".nft.json", "");
+        const node = parseFile(routeFilePath);
+        const { edits } = patchVercelOgImport(node);
+        writeFileSync(routeFilePath, node.commitEdits(edits));
+    }
+}

package/dist/cli/build/patches/investigated/patch-vercel-og-library.spec.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,50 @@
+import { mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import mockFs from "mock-fs";
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { patchVercelOgLibrary } from "./patch-vercel-og-library";
+const nodeModulesVercelOgDir = "node_modules/.pnpm/next@14.2.11/node_modules/next/dist/compiled/@vercel/og";
+const nextServerOgNftPath = "examples/api/.next/server/app/og/route.js.nft.json";
+const openNextFunctionDir = "examples/api/.open-next/server-functions/default/examples/api";
+const openNextOgRoutePath = path.join(openNextFunctionDir, ".next/server/app/og/route.js");
+const openNextVercelOgDir = path.join(openNextFunctionDir, "node_modules/next/dist/compiled/@vercel/og");
+const buildOpts = {
+    appBuildOutputPath: "examples/api",
+    monorepoRoot: "",
+    outputDir: "examples/api/.open-next",
+};
+describe("patchVercelOgLibrary", () => {
+    beforeAll(() => {
+        mockFs();
+        mkdirSync(nodeModulesVercelOgDir, { recursive: true });
+        mkdirSync(path.dirname(nextServerOgNftPath), { recursive: true });
+        mkdirSync(path.dirname(openNextOgRoutePath), { recursive: true });
+        mkdirSync(openNextVercelOgDir, { recursive: true });
+        writeFileSync(nextServerOgNftPath, JSON.stringify({ version: 1, files: [`../../../../../../${nodeModulesVercelOgDir}/index.node.js`] }));
+        writeFileSync(path.join(nodeModulesVercelOgDir, "index.edge.js"), `var fallbackFont = fetch(new URL("./noto-sans-v27-latin-regular.ttf", import.meta.url)).then((res) => res.arrayBuffer());`);
+        writeFileSync(openNextOgRoutePath, `e.exports=import("next/dist/compiled/@vercel/og/index.node.js")`);
+        writeFileSync(path.join(openNextVercelOgDir, "index.node.js"), "");
+        writeFileSync(path.join(openNextVercelOgDir, "noto-sans-v27-latin-regular.ttf"), "");
+    });
+    afterAll(() => mockFs.restore());
+    it("should patch the open-next files correctly", () => {
+        patchVercelOgLibrary(buildOpts);
+        expect(readdirSync(openNextVercelOgDir)).toMatchInlineSnapshot(`
+      [
+        "index.edge.js",
+        "index.node.js",
+        "noto-sans-v27-latin-regular.ttf.bin",
+      ]
+    `);
+        expect(readFileSync(path.join(openNextVercelOgDir, "index.edge.js"), { encoding: "utf-8" }))
+            .toMatchInlineSnapshot(`
+      "async function getFallbackFont() {
+        // .bin is used so that a loader does not need to be configured for .ttf files
+        return (await import("./noto-sans-v27-latin-regular.ttf.bin")).default;
+      }
+
+      var fallbackFont = getFallbackFont();"
+    `);
+        expect(readFileSync(openNextOgRoutePath, { encoding: "utf-8" })).toMatchInlineSnapshot(`"e.exports=import("next/dist/compiled/@vercel/og/index.edge.js")"`);
+    });
+});

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/index.d.ts

@@ -1,8 +1,5 @@
-import { Config } from "../../../../config.js";
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 /**
  * Fixes the webpack-runtime.js file by removing its webpack dynamic requires.
- *
- * This hack is particularly bad as it indicates that files inside the output directory still get a hold of files from the outside: `${nextjsAppPaths.standaloneAppServerDir}/webpack-runtime.js`
- *    so this shows that not everything that's needed to deploy the application is in the output directory...
  */
-export declare function updateWebpackChunksFile(config: Config): Promise<void>;
+export declare function updateWebpackChunksFile(buildOpts: BuildOptions): Promise<void>;

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/index.js

@@ -1,17 +1,17 @@
 import { readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { getUpdatedWebpackChunksFileContent } from "./get-updated-webpack-chunks-file-content.js";
 /**
  * Fixes the webpack-runtime.js file by removing its webpack dynamic requires.
- *
- * This hack is particularly bad as it indicates that files inside the output directory still get a hold of files from the outside: `${nextjsAppPaths.standaloneAppServerDir}/webpack-runtime.js`
- *    so this shows that not everything that's needed to deploy the application is in the output directory...
  */
-export async function updateWebpackChunksFile(config) {
+export async function updateWebpackChunksFile(buildOpts) {
     console.log("# updateWebpackChunksFile");
-    const webpackRuntimeFile = join(config.paths.output.standaloneAppServer, "webpack-runtime.js");
+    const { outputDir } = buildOpts;
+    const dotNextServerDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
+    const webpackRuntimeFile = join(dotNextServerDir, "webpack-runtime.js");
     const fileContent = readFileSync(webpackRuntimeFile, "utf-8");
-    const chunks = readdirSync(join(config.paths.output.standaloneAppServer, "chunks"))
+    const chunks = readdirSync(join(dotNextServerDir, "chunks"))
         .filter((chunk) => /^\d+\.js$/.test(chunk))
         .map((chunk) => {
         console.log(` - chunk ${chunk}`);

package/dist/cli/build/patches/to-investigate/inline-eval-manifest.d.ts

@@ -1,4 +1,4 @@
-import { Config } from "../../../config.js";
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 /**
  * `evalManifest` relies on readFileSync so we need to patch the function so that it instead returns the content of the manifest files
  * which are known at build time
@@ -6,4 +6,4 @@ import { Config } from "../../../config.js";
  * Note: we could/should probably just patch readFileSync here or something, but here the issue is that after the readFileSync call
  * there is a vm `runInNewContext` call which we also don't support (source: https://github.com/vercel/next.js/blob/b1e32c5d1f/packages/next/src/server/load-manifest.ts#L88)
  */
-export declare function inlineEvalManifest(code: string, config: Config): string;
+export declare function inlineEvalManifest(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/inline-eval-manifest.js

@@ -1,4 +1,5 @@
-import { join, posix } from "node:path";
+import { join, relative } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { globSync } from "glob";
 import { normalizePath } from "../../utils/index.js";
 /**
@@ -8,24 +9,27 @@ import { normalizePath } from "../../utils/index.js";
  * Note: we could/should probably just patch readFileSync here or something, but here the issue is that after the readFileSync call
  * there is a vm `runInNewContext` call which we also don't support (source: https://github.com/vercel/next.js/blob/b1e32c5d1f/packages/next/src/server/load-manifest.ts#L88)
  */
-export function inlineEvalManifest(code, config) {
-    const manifestJss = globSync(normalizePath(join(config.paths.output.standaloneAppDotNext, "**/*_client-reference-manifest.js"))).map((file) => normalizePath(file).replace(normalizePath(config.paths.output.standaloneApp) + posix.sep, ""));
+export function inlineEvalManifest(code, buildOpts) {
+    const { outputDir } = buildOpts;
+    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
+    const appDir = join(baseDir, "server/app");
+    const manifests = globSync(join(baseDir, "**/*_client-reference-manifest.js"));
     return code.replace(/function evalManifest\((.+?), .+?\) {/, `$&
-		${manifestJss
-        .map((manifestJs) => `
-			  if ($1.endsWith("${manifestJs}")) {
-				require(${JSON.stringify(join(config.paths.output.standaloneApp, manifestJs))});
-				return {
-				  __RSC_MANIFEST: {
-					"${manifestJs
-        .replace(".next/server/app", "")
-        .replace("_client-reference-manifest.js", "")}": globalThis.__RSC_MANIFEST["${manifestJs
-        .replace(".next/server/app", "")
-        .replace("_client-reference-manifest.js", "")}"],
-				  },
-				};
+		${manifests
+        .map((manifest) => {
+        const endsWith = normalizePath(relative(baseDir, manifest));
+        const key = normalizePath("/" + relative(appDir, manifest)).replace("_client-reference-manifest.js", "");
+        return `
+			  if ($1.endsWith("${endsWith}")) {
+          require(${JSON.stringify(manifest)});
+          return {
+            __RSC_MANIFEST: {
+            "${key}": globalThis.__RSC_MANIFEST["${key}"],
+            },
+          };
 			  }
-			`)
+			`;
+    })
         .join("\n")}
 		throw new Error("Unknown evalManifest: " + $1);
 		`);

package/dist/cli/build/patches/to-investigate/inline-middleware-manifest-require.d.ts

@@ -1,6 +1,6 @@
-import { Config } from "../../../config.js";
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 /**
  * Inlines the middleware manifest from the build output to prevent a dynamic require statement
  * as they result in runtime failures.
  */
-export declare function inlineMiddlewareManifestRequire(code: string, config: Config): string;
+export declare function inlineMiddlewareManifestRequire(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/inline-middleware-manifest-require.js

@@ -1,11 +1,13 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 /**
  * Inlines the middleware manifest from the build output to prevent a dynamic require statement
  * as they result in runtime failures.
  */
-export function inlineMiddlewareManifestRequire(code, config) {
-    const middlewareManifestPath = join(config.paths.output.standaloneAppServer, "middleware-manifest.json");
+export function inlineMiddlewareManifestRequire(code, buildOpts) {
+    const { outputDir } = buildOpts;
+    const middlewareManifestPath = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server/middleware-manifest.json");
     const middlewareManifest = existsSync(middlewareManifestPath)
         ? JSON.parse(readFileSync(middlewareManifestPath, "utf-8"))
         : {};

package/dist/cli/build/patches/to-investigate/inline-next-require.d.ts

@@ -1,6 +1,6 @@
-import { Config } from "../../../config.js";
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 /**
  * The following avoid various Next.js specific files `require`d at runtime since we can just read
  * and inline their content during build time
  */
-export declare function inlineNextRequire(code: string, config: Config): string;
+export declare function inlineNextRequire(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/inline-next-require.js

@@ -1,33 +1,37 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 /**
  * The following avoid various Next.js specific files `require`d at runtime since we can just read
  * and inline their content during build time
  */
-export function inlineNextRequire(code, config) {
-    const pagesManifestFile = join(config.paths.output.standaloneAppServer, "pages-manifest.json");
-    const appPathsManifestFile = join(config.paths.output.standaloneAppServer, "app-paths-manifest.json");
-    const pagesManifestFiles = existsSync(pagesManifestFile)
-        ? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8"))).map((file) => ".next/server/" + file)
+// TODO(vicb): __NEXT_PRIVATE_RUNTIME_TYPE is not handled by this patch
+export function inlineNextRequire(code, buildOpts) {
+    const { outputDir } = buildOpts;
+    const serverDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
+    const pagesManifestFile = join(serverDir, "pages-manifest.json");
+    const appPathsManifestFile = join(serverDir, "app-paths-manifest.json");
+    const pagesManifests = existsSync(pagesManifestFile)
+        ? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8")))
         : [];
-    const appPathsManifestFiles = existsSync(appPathsManifestFile)
-        ? Object.values(JSON.parse(readFileSync(appPathsManifestFile, "utf-8"))).map((file) => ".next/server/" + file)
+    const appPathsManifests = existsSync(appPathsManifestFile)
+        ? Object.values(JSON.parse(readFileSync(appPathsManifestFile, "utf-8")))
         : [];
-    const allManifestFiles = pagesManifestFiles.concat(appPathsManifestFiles);
-    const htmlPages = allManifestFiles.filter((file) => file.endsWith(".html"));
-    const pageModules = allManifestFiles.filter((file) => file.endsWith(".js"));
+    const manifests = pagesManifests.concat(appPathsManifests);
+    const htmlPages = manifests.filter((file) => file.endsWith(".html"));
+    const pageModules = manifests.filter((file) => file.endsWith(".js"));
     return code.replace(/const pagePath = getPagePath\(.+?\);/, `$&
     ${htmlPages
         .map((htmlPage) => `
           if (pagePath.endsWith("${htmlPage}")) {
-            return ${JSON.stringify(readFileSync(join(config.paths.output.standaloneApp, htmlPage), "utf-8"))};
+            return ${JSON.stringify(readFileSync(join(serverDir, htmlPage), "utf-8"))};
           }
         `)
         .join("\n")}
     ${pageModules
         .map((module) => `
           if (pagePath.endsWith("${module}")) {
-            return require(${JSON.stringify(join(config.paths.output.standaloneApp, module))});
+            return require(${JSON.stringify(join(serverDir, module))});
           }
         `)
         .join("\n")}

package/dist/cli/build/patches/to-investigate/patch-find-dir.d.ts

@@ -1,8 +1,5 @@
-import { Config } from "../../../config.js";
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 /**
- * Here we patch `findDir` so that the next server can detect whether the `app` or `pages` directory exists
- * (source: https://github.com/vercel/next.js/blob/ba995993/packages/next/src/lib/find-pages-dir.ts#L4-L13)
- * (usage source: https://github.com/vercel/next.js/blob/ba995993/packages/next/src/server/next-server.ts#L450-L451)
- * Note: `findDir` uses `fs.existsSync` under the hood, so patching that should be enough to make this work
+ * Patches `findDir` so that the next server can detect whether the `app` or `pages` directory exists
  */
-export declare function patchFindDir(code: string, config: Config): string;
+export declare function patchFindDir(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/patch-find-dir.js

@@ -1,20 +1,20 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 /**
- * Here we patch `findDir` so that the next server can detect whether the `app` or `pages` directory exists
- * (source: https://github.com/vercel/next.js/blob/ba995993/packages/next/src/lib/find-pages-dir.ts#L4-L13)
- * (usage source: https://github.com/vercel/next.js/blob/ba995993/packages/next/src/server/next-server.ts#L450-L451)
- * Note: `findDir` uses `fs.existsSync` under the hood, so patching that should be enough to make this work
+ * Patches `findDir` so that the next server can detect whether the `app` or `pages` directory exists
  */
-export function patchFindDir(code, config) {
+export function patchFindDir(code, buildOpts) {
+    const { outputDir } = buildOpts;
+    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
     return code.replace(/function findDir\((?<dir>dir\d*), (?<name>name\d*)\) {/, `function findDir($dir, $name) {
 			if ($dir.endsWith(".next/server")) {
-			if ($name === "app") {
-			  return ${existsSync(`${join(config.paths.output.standaloneAppServer, "app")}`)};
-	    }
-			if ($name === "pages") {
-			  return ${existsSync(`${join(config.paths.output.standaloneAppServer, "pages")}`)};
-	    }
+				if ($name === "app") {
+					return ${existsSync(`${join(baseDir, "app")}`)};
+				}
+				if ($name === "pages") {
+					return ${existsSync(`${join(baseDir, "pages")}`)};
+				}
 		}
 		throw new Error("Unknown findDir call: " + $dir + " " + $name);
 		`);

package/dist/cli/build/patches/to-investigate/patch-read-file.d.ts

@@ -1,3 +1,3 @@
-import { Config } from "../../../config.js";
-export declare function patchBuildId(code: string, config: Config): string;
-export declare function patchLoadManifest(code: string, config: Config): string;
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
+export declare function patchBuildId(code: string, buildOpts: BuildOptions): string;
+export declare function patchLoadManifest(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/patch-read-file.js

@@ -1,26 +1,25 @@
 import { readFileSync } from "node:fs";
-import { join, posix } from "node:path";
+import { join, relative } from "node:path";
+import { getBuildId, getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { globSync } from "glob";
 import { normalizePath } from "../../utils/index.js";
-export function patchBuildId(code, config) {
-    // The next-server code gets the buildId from the filesystem, resulting in a `[unenv] fs.readFileSync is not implemented yet!` error
-    // so we add an early return to the `getBuildId` function so that the `readyFileSync` is never encountered
-    // (source: https://github.com/vercel/next.js/blob/15aeb92efb34c09a36/packages/next/src/server/next-server.ts#L438-L451)
-    // Note: we could/should probably just patch readFileSync here or something!
+export function patchBuildId(code, buildOpts) {
+    // The Next code gets the buildId from the filesystem so we hardcode the value at build time.
     return code.replace("getBuildId() {", `getBuildId() {
-      return ${JSON.stringify(readFileSync(join(config.paths.output.standaloneAppDotNext, "BUILD_ID"), "utf-8"))};
+      return ${JSON.stringify(getBuildId(buildOpts))};
     `);
 }
-export function patchLoadManifest(code, config) {
-    // Same as patchBuildId, the next-server code loads the manifests with `readFileSync` and we want to avoid that
-    // (source: https://github.com/vercel/next.js/blob/15aeb92e/packages/next/src/server/load-manifest.ts#L34-L56)
-    // Note: we could/should probably just patch readFileSync here or something!
-    const manifestJsons = globSync(normalizePath(join(config.paths.output.standaloneAppDotNext, "**/*-manifest.json"))).map((file) => normalizePath(file).replace(normalizePath(config.paths.output.standaloneApp) + posix.sep, ""));
+export function patchLoadManifest(code, buildOpts) {
+    // Inline manifest that Next would otherwise retrieve from the file system.
+    const { outputDir } = buildOpts;
+    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts));
+    const dotNextDir = join(baseDir, ".next");
+    const manifests = globSync(join(dotNextDir, "**/*-manifest.json"));
     return code.replace(/function loadManifest\((.+?), .+?\) {/, `$&
-    ${manifestJsons
-        .map((manifestJson) => `
-          if ($1.endsWith("${manifestJson}")) {
-            return ${readFileSync(join(config.paths.output.standaloneApp, manifestJson), "utf-8")};
+    ${manifests
+        .map((manifest) => `
+          if ($1.endsWith("${normalizePath("/" + relative(dotNextDir, manifest))}")) {
+            return ${readFileSync(manifest, "utf-8")};
           }
         `)
         .join("\n")}

package/dist/cli/build/patches/to-investigate/wrangler-deps.d.ts

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