From 6ec9fbd6acbcde240567cb6c1d4245a4c36ef067 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.gerasimov.26@gmail.com>
Date: Tue, 31 Dec 2024 06:26:29 +0300
Subject: [PATCH 1/2] add support for bun with text lock file

---
 .../common/js-package-manager/JsPackageManagerFactory.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts b/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts
index 3f31adbb1c90..88b1b63cfdad 100644
--- a/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts
+++ b/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts
@@ -13,7 +13,8 @@ import { Yarn2Proxy } from './Yarn2Proxy';
 const NPM_LOCKFILE = 'package-lock.json';
 const PNPM_LOCKFILE = 'pnpm-lock.yaml';
 const YARN_LOCKFILE = 'yarn.lock';
-const BUN_LOCKFILE = 'bun.lockb';
+const BUN_LOCKFILE = 'bun.lock';
+const BUN_LOCKFILE_BINARY = 'bun.lockb';
 
 type PackageManagerProxy =
   | typeof NPMProxy
@@ -37,6 +38,7 @@ export class JsPackageManagerFactory {
       findUpSync(PNPM_LOCKFILE, { cwd }),
       findUpSync(NPM_LOCKFILE, { cwd }),
       findUpSync(BUN_LOCKFILE, { cwd }),
+      findUpSync(BUN_LOCKFILE_BINARY, { cwd }),
     ]
       .filter(Boolean)
       .sort((a, b) => {
@@ -78,7 +80,7 @@ export class JsPackageManagerFactory {
       return new NPMProxy({ cwd });
     }
 
-    if (hasBunCommand && closestLockfile === BUN_LOCKFILE) {
+    if (hasBunCommand && (closestLockfile === BUN_LOCKFILE || closestLockfile === BUN_LOCKFILE_BINARY)) {
       return new BUNProxy({ cwd });
     }
 

From c04ee20a4e4b4002773d1c20d19c4b1e2ff18b95 Mon Sep 17 00:00:00 2001
From: Valentin Palkovic <valentin@chromatic.com>
Date: Thu, 23 Jan 2025 12:28:51 +0100
Subject: [PATCH 2/2] Fix formatting

---
 .../src/common/js-package-manager/JsPackageManagerFactory.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts b/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts
index 88b1b63cfdad..15a32ab5dad3 100644
--- a/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts
+++ b/code/core/src/common/js-package-manager/JsPackageManagerFactory.ts
@@ -80,7 +80,10 @@ export class JsPackageManagerFactory {
       return new NPMProxy({ cwd });
     }
 
-    if (hasBunCommand && (closestLockfile === BUN_LOCKFILE || closestLockfile === BUN_LOCKFILE_BINARY)) {
+    if (
+      hasBunCommand &&
+      (closestLockfile === BUN_LOCKFILE || closestLockfile === BUN_LOCKFILE_BINARY)
+    ) {
       return new BUNProxy({ cwd });
     }