feat: add bun support

.changeset/warm-toys-check.md

@@ -0,0 +1,5 @@
+---
+'create-solana-dapp': minor
+---
+
+add bun support

src/utils/create-app-task-install-dependencies.ts

@@ -16,7 +16,7 @@ export function createAppTaskInstallDependencies(args: GetArgsResult): Task {
       if (args.verbose) {
         log.warn(`Installing via ${pm}`)
       }
-      const deleteLockFiles = ['package-lock.json', 'pnpm-lock.yaml', 'yarn.lock']
+      const deleteLockFiles = ['package-lock.json', 'pnpm-lock.yaml', 'yarn.lock', 'bun.lock']
         // We don't want to delete the lock file for the current package manager
         .filter((item) => item !== lockFile)
         // We only want to delete the lock file if it exists

src/utils/final-note.ts

@@ -16,7 +16,7 @@ export function finalNote(args: FinalNoteArgs): string {
     `That's it!`,
     `Change to your new directory and start developing:`,
     msg(`cd ${args.target}`),
-    ...(args.skipInstall ? [`Install dependencies:`, cmd(args.packageManager, 'install')] : []),
+    ...(args.skipInstall ? [`Install dependencies:`, msg(`${args.packageManager} install`)] : []),
     ...(startScript ? [`Start the app:`, cmd(args.packageManager, startScript)] : []),
     ...args.instructions.map((line) => (line.startsWith('+') ? msg(line.slice(1)) : line)),
   ]

src/utils/get-args.ts

@@ -16,6 +16,7 @@ export async function getArgs(argv: string[], app: AppInfo, pm: PackageManager =
     .option('--pm, --package-manager <package-manager>', help(`Package manager to use (default: npm)`))
     .option('--yarn', help(`Use yarn as the package manager`), false)
     .option('--pnpm', help(`Use pnpm as the package manager`), false)
+    .option('--bun', help(`Use bun as the package manager`), false)
     .option('-d, --dry-run', help('Dry run (default: false)'))
     .option('-t, --template <template-name>', help('Use a template'))
     .option('--list-templates', help('List available templates'))
@@ -55,17 +56,21 @@ Examples:
   }
   let packageManager = result.packageManager ?? pm
 
-  // The 'yarn' and 'pnpm' options are mutually exclusive, and will override the 'packageManager' option
-  if (result.pnpm && result.yarn) {
-    log.error(`Both pnpm and yarn were specified. Please specify only one.`)
-    throw new Error(`Both pnpm and yarn were specified. Please specify only one.`)
+  // The 'yarn', 'pnpm' and 'bun' options are mutually exclusive, and will override the 'packageManager' option
+  const managers = [result.pnpm && 'pnpm', result.yarn && 'yarn', result.bun && 'bun'].filter(Boolean)
+  if (managers.length > 1) {
+    log.error(`Multiple package managers were specified: ${managers.join(', ')}. Please specify only one.`)
+    throw new Error(`Multiple package managers were specified: ${managers.join(', ')}. Please specify only one.`)
   }
   if (result.pnpm) {
     packageManager = 'pnpm'
   }
   if (result.yarn) {
     packageManager = 'yarn'
   }
+  if (result.bun) {
+    packageManager = 'bun'
+  }
 
   // Display the intro
   intro(`${app.name} ${app.version}`)

src/utils/vendor/package-manager.ts

@@ -11,26 +11,28 @@
  */
 import { execSync } from 'node:child_process'
 import { existsSync } from 'node:fs'
-import { join } from 'node:path'
+import { join, sep } from 'node:path'
 
-export const packageManagers = ['pnpm', 'npm', 'yarn'] as const
+export const packageManagers = ['pnpm', 'npm', 'yarn', 'bun'] as const
 export type PackageManager = (typeof packageManagers)[number]
 
 export function detectInvokedPackageManager(): PackageManager {
-  let detectedPackageManager: PackageManager = 'npm'
-  const invoker = require.main
-
-  if (!invoker) {
-    return detectedPackageManager
+  if (process.env.npm_config_user_agent) {
+    for (const pm of packageManagers) {
+      if (process.env.npm_config_user_agent.startsWith(`${pm}/`)) {
+        return pm
+      }
+    }
   }
 
-  for (const pkgManager of packageManagers) {
-    if (invoker.path.includes(pkgManager)) {
-      detectedPackageManager = pkgManager
-      break
+  if (process.env.npm_execpath) {
+    for (const pm of packageManagers) {
+      if (process.env.npm_execpath.split(sep).includes(pm)) {
+        return pm
+      }
     }
   }
-  return detectedPackageManager
+  return 'npm'
 }
 
 /**
@@ -99,6 +101,15 @@ export function getPackageManagerCommand(
         lockFile: 'package-lock.json',
       }
     }
+
+    case 'bun': {
+      return {
+        install: `bun install ${silent}`,
+        exec: 'bun',
+        globalAdd: 'bun add -g',
+        lockFile: 'bun.lock',
+      }
+    }
   }
 }
 const pmVersionCache = new Map<PackageManager, string>()
@@ -123,6 +134,9 @@ export function detectPackageManager(dir: string = ''): PackageManager {
   if (existsSync(join(dir, 'pnpm-lock.yaml'))) {
     return 'pnpm'
   }
+  if (existsSync(join(dir, 'bun.lock'))) {
+    return 'bun'
+  }
 
   return 'npm'
 }

test/final-note.test.ts

@@ -33,7 +33,7 @@ describe('finalNote', () => {
     const result = finalNote({ ...baseArgs, skipInstall: true })
 
     expect(result).toContain('Install dependencies:')
-    expect(result).toContain('npm run install')
+    expect(result).toContain('npm install')
   })
 
   it('should not include install instructions when skipInstall is false', () => {
@@ -44,7 +44,7 @@ describe('finalNote', () => {
     const result = finalNote({ ...baseArgs, skipInstall: false })
 
     expect(result).not.toContain('Install dependencies:')
-    expect(result).not.toContain('npm run install')
+    expect(result).not.toContain('npm install')
   })
 
   it('should use yarn when packageManager is yarn and skipInstall is true', () => {
@@ -58,6 +58,6 @@ describe('finalNote', () => {
       packageManager: 'yarn' as FinalNoteArgs['packageManager'],
     })
 
-    expect(result).toContain('yarn run install')
+    expect(result).toContain('yarn install')
   })
 })