From 93c854458dc93414313d13a8847dabc1c23c0c11 Mon Sep 17 00:00:00 2001 From: cuquo Date: Fri, 24 Jan 2025 01:24:34 +0000 Subject: [PATCH 1/3] feat: support new bun lock file --- packages/open-next/src/build/helper.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts index 819b5de45..1431bc982 100644 --- a/packages/open-next/src/build/helper.ts +++ b/packages/open-next/src/build/helper.ts @@ -73,6 +73,7 @@ function findMonorepoRoot(appPath: string) { { file: "yarn.lock", packager: "yarn" as const }, { file: "pnpm-lock.yaml", packager: "pnpm" as const }, { file: "bun.lockb", packager: "bun" as const }, + { file: "bun.lock", packager: "bun" as const }, ].find((f) => fs.existsSync(path.join(currentPath, f.file))); if (found) { From 51089fca7a58857e71f1802f9a4dbc09dc772a13 Mon Sep 17 00:00:00 2001 From: cuquo Date: Fri, 24 Jan 2025 08:16:13 +0000 Subject: [PATCH 2/3] revision changes --- packages/open-next/src/build/helper.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts index 1431bc982..0fdd9789a 100644 --- a/packages/open-next/src/build/helper.ts +++ b/packages/open-next/src/build/helper.ts @@ -69,11 +69,11 @@ function findMonorepoRoot(appPath: string) { let currentPath = appPath; while (currentPath !== "/") { const found = [ + { file: "bun.lockb", packager: "bun" as const }, + { file: "bun.lock", packager: "bun" as const }, { file: "package-lock.json", packager: "npm" as const }, { file: "yarn.lock", packager: "yarn" as const }, { file: "pnpm-lock.yaml", packager: "pnpm" as const }, - { file: "bun.lockb", packager: "bun" as const }, - { file: "bun.lock", packager: "bun" as const }, ].find((f) => fs.existsSync(path.join(currentPath, f.file))); if (found) { From f6aaca00e745d0dc10c8390d18bffc932a4b02bf Mon Sep 17 00:00:00 2001 From: cuquo Date: Fri, 24 Jan 2025 02:27:27 -0600 Subject: [PATCH 3/3] Update packages/open-next/src/build/helper.ts Co-authored-by: Victor Berchet --- packages/open-next/src/build/helper.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts index 0fdd9789a..13b205c22 100644 --- a/packages/open-next/src/build/helper.ts +++ b/packages/open-next/src/build/helper.ts @@ -69,6 +69,7 @@ function findMonorepoRoot(appPath: string) { let currentPath = appPath; while (currentPath !== "/") { const found = [ + // bun can generate yaml lock files (`bun install --yarn`) so bun should be before yarn { file: "bun.lockb", packager: "bun" as const }, { file: "bun.lock", packager: "bun" as const }, { file: "package-lock.json", packager: "npm" as const },