Apply lockfile mapping review suggestion

Author: afurm

packages/app/src/cli/services/init/template/cleanup.ts

@@ -1,5 +1,5 @@
 import {rmdir, glob, fileExistsSync, unlinkFile} from '@shopify/cli-kit/node/fs'
-import {lockfiles, lockfilesForPackageManager, PackageManager} from '@shopify/cli-kit/node/node-package-manager'
+import {lockfiles, lockfilesByManager, PackageManager} from '@shopify/cli-kit/node/node-package-manager'
 import {joinPath} from '@shopify/cli-kit/node/path'
 
 export default async function cleanup(webOutputDirectory: string, packageManager: PackageManager) {
@@ -23,7 +23,7 @@ export default async function cleanup(webOutputDirectory: string, packageManager
 
   const gitPathPromises = gitPaths.map((path) => rmdir(path, {force: true}))
 
-  const lockfilesToKeep = new Set(lockfilesForPackageManager(packageManager))
+  const lockfilesToKeep = new Set(lockfilesByManager[packageManager])
   const lockfilePromises = lockfiles
     .filter((lockfile) => !lockfilesToKeep.has(lockfile))
     .map((lockfile) => {

packages/cli-kit/src/public/node/node-package-manager.test.ts

@@ -22,7 +22,7 @@ import {
   inferPackageManager,
   PackageManager,
   npmLockfile,
-  lockfilesForPackageManager,
+  lockfilesByManager,
 } from './node-package-manager.js'
 import {captureOutput, exec} from './system.js'
 import {inTemporaryDirectory, mkdir, touchFile, writeFile} from './fs.js'
@@ -133,9 +133,9 @@ describe('install', () => {
   })
 })
 
-describe('lockfilesForPackageManager', () => {
-  test('returns both Bun lockfile names', () => {
-    expect(lockfilesForPackageManager('bun')).toEqual(['bun.lockb', 'bun.lock'])
+describe('lockfilesByManager', () => {
+  test('maps Bun to both lockfile names', () => {
+    expect(lockfilesByManager.bun).toEqual(['bun.lockb', 'bun.lock'])
   })
 })
 

packages/cli-kit/src/public/node/node-package-manager.ts

@@ -30,13 +30,13 @@ export const pnpmWorkspaceFile = 'pnpm-workspace.yaml'
 
 /** An array containing the lockfiles from all the package managers */
 export const lockfiles: Lockfile[] = [yarnLockfile, pnpmLockfile, npmLockfile, bunLockfile, modernBunLockfile]
-export const lockfilesByManager: Record<PackageManager, Lockfile | undefined> = {
-  yarn: yarnLockfile,
-  npm: npmLockfile,
-  pnpm: pnpmLockfile,
-  bun: bunLockfile,
-  homebrew: undefined,
-  unknown: undefined,
+export const lockfilesByManager: Record<PackageManager, Lockfile[]> = {
+  yarn: [yarnLockfile],
+  npm: [npmLockfile],
+  pnpm: [pnpmLockfile],
+  bun: [bunLockfile, modernBunLockfile],
+  homebrew: [],
+  unknown: [],
 }
 export type Lockfile = 'yarn.lock' | 'package-lock.json' | 'pnpm-lock.yaml' | 'bun.lockb' | 'bun.lock'
 
@@ -55,13 +55,6 @@ export const packageManager = ['yarn', 'npm', 'pnpm', 'bun', 'homebrew', 'unknow
 export type PackageManager = (typeof packageManager)[number]
 type ProjectPackageManager = Extract<PackageManager, 'yarn' | 'npm' | 'pnpm' | 'bun'>
 
-export function lockfilesForPackageManager(packageManager: PackageManager): Lockfile[] {
-  if (packageManager === 'bun') return [bunLockfile, modernBunLockfile]
-
-  const lockfile = lockfilesByManager[packageManager]
-  return lockfile ? [lockfile] : []
-}
-
 /**
  * Returns an abort error that's thrown when the package manager can't be determined.
  * @returns An abort error.