Merge pull request #236012 from The-Fiery-Fire/bun

`bun.lock` as package manager lockfile
microsoft · Dec 20, 2024 · eb66332 · eb66332
2 parents b9084ed + 1e3788f
commit eb66332
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/extensions/npm/src/preferred-pm.ts b/extensions/npm/src/preferred-pm.ts
@@ -28,6 +28,10 @@ async function isBunPreferred(pkgPath: string): Promise<PreferredProperties> {
 		return { isPreferred: true, hasLockfile: true };
 	}
 
+	if (await pathExists(path.join(pkgPath, 'bun.lock'))) {
+		return { isPreferred: true, hasLockfile: true };
+	}
+
 	return { isPreferred: false, hasLockfile: false };
 }
 

diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -619,7 +619,7 @@ configurationRegistry.registerConfiguration({
 				'*.jsx': '${capture}.js',
 				'*.tsx': '${capture}.ts',
 				'tsconfig.json': 'tsconfig.*.json',
-				'package.json': 'package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb',
+				'package.json': 'package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb, bun.lock',
 			}
 		}
 	}