fixup! og with turbopack

Author: vicb

packages/cloudflare/src/cli/build/patches/ast/patch-vercel-og-library.ts

@@ -24,6 +24,8 @@ export function patchVercelOgLibrary(buildOpts: BuildOptions) {
 	for (const traceInfoPath of globSync(path.join(appBuildOutputPath, ".next/server/**/*.nft.json"), {
 		windowsPathsNoEscape: true,
 	})) {
+		let edgeFilePatched = false;
+
 		const traceInfo: TraceInfo = JSON.parse(readFileSync(traceInfoPath, { encoding: "utf8" }));
 		const tracedNodePath = traceInfo.files.find((p) => p.endsWith("@vercel/og/index.node.js"));
 
@@ -40,17 +42,23 @@ export function patchVercelOgLibrary(buildOpts: BuildOptions) {
 			);
 
 			copyFileSync(tracedEdgePath, outputEdgePath);
+		}
 
+		if (!edgeFilePatched) {
+			edgeFilePatched = true;
 			// 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`));
+			if (matches.length > 0) {
+				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.
+		// This is only useful when tubopack is not used to bundle the function.
 		const routeFilePath = traceInfoPath.replace(appBuildOutputPath, packagePath).replace(".nft.json", "");
 
 		const node = parseFile(routeFilePath);

packages/cloudflare/src/cli/build/patches/plugins/turbopack.ts

@@ -20,22 +20,26 @@ export const inlineChunksPatch: CodePatcher = {
 			}),
 			contentFilter: /loadRuntimeChunkPath/,
 			patchCode: async ({ code, tracedFiles }) => {
-				const patched = patchCode(code, inlineChunksRule);
+				let patched = patchCode(code, inlineExternalImportRule);
+				patched = patchCode(patched, inlineChunksRule);
 
 				return `${patched}\n${inlineChunksFn(tracedFiles)}`;
 			},
 		},
 	],
 };
 
-function getInlinableChunks(tracedFiles: string[]) {
+function getInlinableChunks(tracedFiles: string[]): string[] {
 	const chunks = new Set<string>();
 	for (const file of tracedFiles) {
-		if (file.includes(".next/server/chunks/") && !file.includes("[turbopack]_runtime.js")) {
+		if (file === "[turbopack]_runtime.js") {
+			continue;
+		}
+		if (file.includes(".next/server/chunks/")) {
 			chunks.add(file);
 		}
 	}
-	return chunks;
+	return Array.from(chunks);
 }
 
 function inlineChunksFn(tracedFiles: string[]) {
@@ -44,12 +48,12 @@ function inlineChunksFn(tracedFiles: string[]) {
 	return `
   function requireChunk(chunkPath) {
     switch(chunkPath) {
-${Array.from(chunks)
+${chunks
 	.map(
 		(chunk) =>
 			`      case "${
 				// we only want the path after /path/to/.next/
-				chunk.replace(/.*\.next\//, "")
+				chunk.replace(/.*\/\.next\//, "")
 			}": return require("${chunk}");`
 	)
 	.join("\n")}
@@ -59,3 +63,20 @@ ${Array.from(chunks)
   }
 `;
 }
+
+const inlineExternalImportRule = `
+rule:
+  pattern: "$RAW = await import($ID)"
+  inside:
+    regex: "externalImport"
+    kind: function_declaration
+    stopBy: end
+fix: |-
+  switch ($ID) {
+    case "next/dist/compiled/@vercel/og/index.node.js":
+      $RAW = await import("next/dist/compiled/@vercel/og/index.edge.js");
+      break;
+    default:
+      $RAW = await import($ID);
+  }
+`;