refactor: detect packageManager using sink helper

Author: thetutlage

index.ts

@@ -16,7 +16,7 @@ import { tasks } from './Tasks'
 import { greet } from './src/Chalk/greet'
 import { showArt } from './src/Chalk/art'
 import { getHelp } from './src/Chalk/help'
-import { getState, packageManager } from './src/Helpers'
+import { getState } from './src/Helpers'
 
 /**
  * Running all the tasks to create a new project.
@@ -42,7 +42,7 @@ export async function runTasks(args: string[]) {
    * Show help when no arguments are passed
    */
   if (!argv._.length) {
-    console.log(getHelp(packageManager))
+    console.log(getHelp(utils.getPackageManager(process.cwd())))
     return
   }
 
@@ -58,7 +58,7 @@ export async function runTasks(args: string[]) {
    * Setup state
    */
   const state = await getState(projectPath, {
-    client: packageManager,
+    client: utils.getPackageManager(projectPath),
     projectName: argv.name,
     debug: argv.debug,
     boilerplate: argv.boilerplate,

src/Chalk/help.ts

@@ -8,13 +8,12 @@
  */
 
 import { logger } from '@adonisjs/sink'
-import type { SupportedPackageManager } from '../Helpers'
 
 /**
  * Text to show on the help screen. Its simple and hence writing it
  * by hand is fine
  */
-export const getHelp = (packageManager: SupportedPackageManager) => {
+export const getHelp = (packageManager: 'npm' | 'pnpm' | 'yarn') => {
   const runSentence =
     packageManager === 'yarn'
       ? 'yarn create adonis-ts-app'

src/Contracts/index.ts

@@ -9,7 +9,6 @@
 
 import { logger as sinkLogger, files } from '@adonisjs/sink'
 import { ApplicationContract } from '@ioc:Adonis/Core/Application'
-import type { SupportedPackageManager } from '../Helpers'
 
 /**
  * Shape of task functions
@@ -27,7 +26,7 @@ export type CliState = {
   baseName: string
   absPath: string
   debug: boolean
-  client: SupportedPackageManager
+  client: 'npm' | 'pnpm' | 'yarn'
   boilerplate: 'web' | 'api' | 'slim'
   projectName: string
   eslint: boolean

src/Helpers/index.ts

@@ -30,7 +30,7 @@ export async function getState(
     projectName?: string
     eslint?: boolean
     prettier?: boolean
-    client: SupportedPackageManager
+    client: 'npm' | 'pnpm' | 'yarn'
     encore?: boolean
   }
 ): Promise<CliState> {
@@ -196,15 +196,3 @@ export function getInstallMessage(list: string[]): string {
 
   return dependencies.join(', ')
 }
-
-export type SupportedPackageManager = typeof packageManager
-
-/**
- * Detect what package manager is in used, fallback to npm.
- */
-export const packageManager =
-  process.env.npm_execpath && process.env.npm_execpath.includes('yarn')
-    ? 'yarn'
-    : process.env.npm_execpath && process.env.npm_execpath.includes('pnpm')
-    ? 'pnpm'
-    : 'npm'