review and e2e fix

Author: conico974

examples/prisma/e2e/prisma.spec.ts

@@ -3,19 +3,19 @@ import { test, expect } from "@playwright/test";
 test.describe("playground/cloudflare", () => {
   test("Prisma doesn't crash", async ({ page }) => {
     await page.goto("/");
-    const aliceName = await page.getByTestId("name-1").innerText();
+    const aliceName = await page.getByTestId("name-Alice").innerText();
     expect(aliceName).toBe("Alice");
-    const aliceEmail = await page.getByTestId("email-1").innerText();
+    const aliceEmail = await page.getByTestId("email-Alice").innerText();
     expect(aliceEmail).toBe("[email protected]");
 
-    const bobName = await page.getByTestId("name-2").innerText();
+    const bobName = await page.getByTestId("name-Bob").innerText();
     expect(bobName).toBe("Bob");
-    const bobEmail = await page.getByTestId("email-2").innerText();
+    const bobEmail = await page.getByTestId("email-Bob").innerText();
     expect(bobEmail).toBe("[email protected]");
 
-    const carolName = await page.getByTestId("name-3").innerText();
+    const carolName = await page.getByTestId("name-Carol").innerText();
     expect(carolName).toBe("Carol");
-    const carolEmail = await page.getByTestId("email-3").innerText();
+    const carolEmail = await page.getByTestId("email-Carol").innerText();
     expect(carolEmail).toBe("[email protected]");
   });
 });

examples/prisma/package.json

@@ -7,8 +7,8 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "prepare:db": "npx prisma generate && wrangler d1 ",
-    "build:worker": "npx prisma generate && pnpm opennextjs-cloudflare build",
+    "prepare:db": "npx prisma generate && wrangler d1 execute db --file populate.sql",
+    "build:worker": "pnpm prepare:db && pnpm opennextjs-cloudflare build",
     "preview:worker": "pnpm opennextjs-cloudflare preview",
     "preview": "pnpm build:worker && pnpm preview:worker",
     "e2e": "playwright test -c e2e/playwright.config.ts",

examples/prisma/src/app/page.tsx

@@ -1,4 +1,3 @@
-import Image from "next/image";
 import styles from "./page.module.css";
 import { getDb } from "@/lib/db";
 
@@ -12,9 +11,9 @@ export default async function Home() {
       <ul>
         {allUsers.map((user) => (
           <li key={user.id}>
-            <span data-testid={`name-${user.id}`}>{user.name}</span>
+            <span data-testid={`name-${user.name}`}>{user.name}</span>
             <br />
-            <span data-testid={`email-${user.id}`}>{user.email}</span>
+            <span data-testid={`email-${user.name}`}>{user.email}</span>
           </li>
         ))}
       </ul>

packages/cloudflare/src/cli/build/utils/workerd.ts

@@ -11,24 +11,30 @@ import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
  * to only include the build condition if found (e.g. "workerd") and remove everything else.
  * If no build condition is found, it keeps everything as is.
  * It also returns a boolean indicating if the build condition was found.
- * @param exports The exports (or imports) object from the package.json
+ * @param conditionMap The exports (or imports) object from the package.json
  * @param condition The build condition to look for
  * @returns An object with the transformed exports and a boolean indicating if the build condition was found
  */
-export function transformBuildCondition(exports: { [key: string]: unknown }, condition: string) {
+export function transformBuildCondition(
+  conditionMap: { [key: string]: unknown },
+  condition: string
+): {
+  transformedExports: { [key: string]: unknown };
+  hasBuildCondition: boolean;
+} {
   const transformed: { [key: string]: unknown } = {};
-  const hasTopLevelBuildCondition = Object.keys(exports).some(
-    (key) => key === condition && typeof exports[key] === "string"
+  const hasTopLevelBuildCondition = Object.keys(conditionMap).some(
+    (key) => key === condition && typeof conditionMap[key] === "string"
   );
   let hasBuildCondition = hasTopLevelBuildCondition;
-  for (const [key, value] of Object.entries(exports)) {
+  for (const [key, value] of Object.entries(conditionMap)) {
     if (typeof value === "object" && value != null) {
       const { transformedExports, hasBuildCondition: innerBuildCondition } = transformBuildCondition(
         value as { [key: string]: unknown },
         condition
       );
       transformed[key] = transformedExports;
-      hasBuildCondition = hasBuildCondition || innerBuildCondition;
+      hasBuildCondition ||= innerBuildCondition;
     } else {
       // If it doesn't have the build condition, we need to keep everything as is
       // If it has the build condition, we need to keep only the build condition
@@ -55,17 +61,17 @@ interface PackageJson {
  * @returns An object with the transformed package.json and a boolean indicating if the build condition was found
  */
 export function transformPackageJson(json: PackageJson) {
-  const transformed: PackageJson = { ...json };
+  const transformed: PackageJson = structuredClone(json);
   let hasBuildCondition = false;
   if (json.exports) {
     const exp = transformBuildCondition(json.exports, "workerd");
     transformed.exports = exp.transformedExports;
-    hasBuildCondition = exp.hasBuildCondition;
+    hasBuildCondition ||= exp.hasBuildCondition;
   }
   if (json.imports) {
     const imp = transformBuildCondition(json.imports, "workerd");
     transformed.imports = imp.transformedExports;
-    hasBuildCondition = hasBuildCondition || imp.hasBuildCondition;
+    hasBuildCondition ||= imp.hasBuildCondition;
   }
   return { transformed, hasBuildCondition };
 }
@@ -86,7 +92,7 @@ export async function copyWorkerdPackages(options: BuildOptions, nodePackages: M
           `Copying package using a workerd condition: ${path.relative(options.appPath, src)} -> ${path.relative(options.appPath, dst)}`
         );
         await fs.cp(src, dst, { recursive: true, force: true });
-        // Write the transformed package.json
+        // Overwrite with  the transformed package.json
         await fs.writeFile(path.join(dst, "package.json"), JSON.stringify(transformed), "utf8");
       }
     } catch {