Merge pull request #2536 from latreon/fix/bun-lockfile-detection

fix(scripts): detect modern bun.lock, ignore stray root lockfiles
This commit is contained in:
haelyra 2026-07-24 12:53:06 -04:00 committed by GitHub
commit 374feb7f9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 4 deletions

5
.gitignore vendored
View file

@ -99,6 +99,11 @@ ecc2/target/
# Generated lock files in tool subdirectories
.opencode/package-lock.json
.opencode/node_modules/
# yarn is the canonical package manager for this repo (see package.json
# "packageManager"); ignore stray lockfiles from running another manager locally
/bun.lock
/bun.lockb
assets/images/security/badrudi-exploit.mp4
.aider*

View file

@ -43,7 +43,10 @@ const PACKAGE_MANAGERS = {
},
bun: {
name: 'bun',
lockFile: 'bun.lockb',
lockFile: 'bun.lock',
// Bun switched its default lockfile from the binary bun.lockb to the
// text-based bun.lock. Keep recognizing the legacy file too.
lockFileAliases: ['bun.lockb'],
installCmd: 'bun install',
runCmd: 'bun run',
execCmd: 'bunx',
@ -92,9 +95,9 @@ function saveConfig(config) {
function detectFromLockFile(projectDir = process.cwd()) {
for (const pmName of DETECTION_PRIORITY) {
const pm = PACKAGE_MANAGERS[pmName];
const lockFilePath = path.join(projectDir, pm.lockFile);
const lockFileNames = [pm.lockFile, ...(pm.lockFileAliases || [])];
if (fs.existsSync(lockFilePath)) {
if (lockFileNames.some(lockFileName => fs.existsSync(path.join(projectDir, lockFileName)))) {
return pmName;
}
}

View file

@ -131,7 +131,7 @@ function runTests() {
})) passed++;
else failed++;
if (test('detects bun from bun.lockb', () => {
if (test('detects bun from bun.lockb (legacy binary lockfile)', () => {
const testDir = createTestDir();
try {
fs.writeFileSync(path.join(testDir, 'bun.lockb'), '');
@ -143,6 +143,18 @@ function runTests() {
})) passed++;
else failed++;
if (test('detects bun from bun.lock (modern text lockfile)', () => {
const testDir = createTestDir();
try {
fs.writeFileSync(path.join(testDir, 'bun.lock'), '');
const result = pm.detectFromLockFile(testDir);
assert.strictEqual(result, 'bun');
} finally {
cleanupTestDir(testDir);
}
})) passed++;
else failed++;
if (test('returns null when no lock file exists', () => {
const testDir = createTestDir();
try {