@opennextjs/cloudflare 0.3.9 → 0.4.0

package/dist/cli/build/patches/ast/optional-deps.spec.js

@@ -0,0 +1,89 @@
+import { describe, expect, it } from "vitest";
+import { optionalDepRule } from "./optional-deps.js";
+import { patchCode } from "./util.js";
+describe("optional dependecy", () => {
+    it('should wrap a top-level require("caniuse-lite") in a try-catch', () => {
+        const code = `t = require("caniuse-lite");`;
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        t = require("caniuse-lite");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite" is not installed');
+      };"
+    `);
+    });
+    it('should wrap a top-level require("caniuse-lite/data") in a try-catch', () => {
+        const code = `t = require("caniuse-lite/data");`;
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        t = require("caniuse-lite/data");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite/data" is not installed');
+      };"
+    `);
+    });
+    it('should wrap e.exports = require("caniuse-lite") in a try-catch', () => {
+        const code = 'e.exports = require("caniuse-lite");';
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        e.exports = require("caniuse-lite");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite" is not installed');
+      };"
+    `);
+    });
+    it('should wrap module.exports = require("caniuse-lite") in a try-catch', () => {
+        const code = 'module.exports = require("caniuse-lite");';
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        module.exports = require("caniuse-lite");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite" is not installed');
+      };"
+    `);
+    });
+    it('should wrap exports.foo = require("caniuse-lite") in a try-catch', () => {
+        const code = 'exports.foo = require("caniuse-lite");';
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        exports.foo = require("caniuse-lite");
+      } catch {
+        throw new Error('The optional dependency "caniuse-lite" is not installed');
+      };"
+    `);
+    });
+    it('should not wrap require("lodash") in a try-catch', () => {
+        const code = 't = require("lodash");';
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`"t = require("lodash");"`);
+    });
+    it('should not wrap require("other-module") if it does not match caniuse-lite regex', () => {
+        const code = 't = require("other-module");';
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`"t = require("other-module");"`);
+    });
+    it("should not wrap a require() call already inside a try-catch", () => {
+        const code = `
+try {
+  const t = require("caniuse-lite");
+} catch {}
+`;
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        const t = require("caniuse-lite");
+      } catch {}
+      "
+    `);
+    });
+    it("should handle require with subpath and not wrap if already in try-catch", () => {
+        const code = `
+try {
+  const t = require("caniuse-lite/path");
+} catch {}
+`;
+        expect(patchCode(code, optionalDepRule)).toMatchInlineSnapshot(`
+      "try {
+        const t = require("caniuse-lite/path");
+      } catch {}
+      "
+    `);
+    });
+});

package/dist/cli/build/patches/ast/util.d.ts

@@ -0,0 +1,50 @@
+import { type Edit, Lang, type NapiConfig, type SgNode } from "@ast-grep/napi";
+/**
+ * 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 declare function applyRule(rule: string | RuleConfig, root: SgNode, { once }?: {
+    once?: boolean | undefined;
+}): {
+    edits: Edit[];
+    matches: SgNode<import("@ast-grep/napi/types/staticTypes").TypesMap, import("@ast-grep/napi/types/staticTypes").Kinds<import("@ast-grep/napi/types/staticTypes").TypesMap>>[];
+};
+/**
+ * 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 declare function parseFile(path: string, lang?: Lang): SgNode<import("@ast-grep/napi/types/staticTypes").TypesMap, import("@ast-grep/napi/types/staticTypes").Kinds<import("@ast-grep/napi/types/staticTypes").TypesMap>>;
+/**
+ * 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 declare function patchCode(code: string, rule: string | RuleConfig, { lang, once }?: {
+    lang?: Lang | undefined;
+    once?: boolean | undefined;
+}): string;

package/dist/cli/build/patches/ast/util.js

@@ -0,0 +1,65 @@
+import { readFileSync } from "node:fs";
+import { Lang, parse } from "@ast-grep/napi";
+import yaml from "yaml";
+/**
+ * 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, root, { once = false } = {}) {
+    const 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 = [];
+    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, 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, rule, { lang = Lang.TypeScript, once = false } = {}) {
+    const node = parse(lang, code).root();
+    const { edits } = applyRule(rule, node, { once });
+    return node.commitEdits(edits);
+}

package/dist/cli/build/patches/ast/util.spec.d.ts

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

package/dist/cli/build/patches/ast/util.spec.js

@@ -0,0 +1,43 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { patchCode } from "./util.js";
+describe("patchCode", () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it("should throw an error if rule has a transform", () => {
+        expect(() => patchCode(`console.log("hi")`, { rule: { pattern: "console.log($MSG)" }, transform: "not supported" })).toThrow(/not supported/);
+    });
+    it("should throw an error if rule has no fix", () => {
+        expect(() => patchCode(`console.log("hi")`, { rule: { pattern: "console.log($MSG)" } })).toThrow(/no fix/);
+    });
+    it("should accept yaml rules", () => {
+        const yamlRule = `
+rule:
+  pattern: a
+fix: b
+`;
+        expect(patchCode(`a`, yamlRule)).toEqual("b");
+    });
+    it("should apply fix to a single match when once is true", () => {
+        expect(patchCode(`a+a`, { rule: { pattern: "a" }, fix: "b" }, { once: true })).toEqual("b+a");
+    });
+    it("should apply fix to all matches when once is false (default)", () => {
+        expect(patchCode(`a+a`, { rule: { pattern: "a" }, fix: "b" })).toEqual("b+b");
+        expect(patchCode(`a+a`, { rule: { pattern: "a" }, fix: "b" }, { once: false })).toEqual("b+b");
+    });
+    it("should handle no matches", () => {
+        expect(patchCode(`a`, { rule: { pattern: "b" }, fix: "c" })).toEqual("a");
+    });
+    it("should replace $PLACEHOLDER with match text", () => {
+        expect(patchCode(`console.log(message)`, { rule: { pattern: "console.log($MSG)" }, fix: "$MSG" })).toEqual("message");
+    });
+    it("should handle $PLACEHODLERS that are not found in matches", () => {
+        expect(patchCode(`console.log(message)`, { rule: { pattern: "console.log($MSG)" }, fix: "$WHAT$$$WHAT" })).toEqual("$WHAT");
+    });
+    it("should replace $$$PLACEHOLDER with match text", () => {
+        expect(patchCode(`console.log("hello" + world, "!")`, {
+            rule: { pattern: "console.log($$$ARGS)" },
+            fix: "$$$ARGS",
+        })).toEqual(`"hello" + world,"!"`);
+    });
+});

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;