@sanity/cli 3.44.1-canary.21 → 3.44.1-canary.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.44.1-canary.21+755294d534",
+  "version": "3.44.1-canary.30+a154d9ea75",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -58,9 +58,9 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^6.19.1",
-    "@sanity/codegen": "3.44.1-canary.21+755294d534",
+    "@sanity/codegen": "3.44.1-canary.30+a154d9ea75",
     "@sanity/telemetry": "^0.7.7",
-    "@sanity/util": "3.44.1-canary.21+755294d534",
+    "@sanity/util": "3.44.1-canary.30+a154d9ea75",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -82,7 +82,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.44.1-canary.21+755294d534",
+    "@sanity/types": "3.44.1-canary.30+a154d9ea75",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -135,5 +135,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "755294d53490488afc37f19100b00172bf48a3f6"
+  "gitHead": "a154d9ea757f553d108217bb3dfe76af4bda4e19"
 }

package/src/actions/init-project/initProject.ts

@@ -21,6 +21,8 @@ import {
   installNewPackages,
 } from '../../packageManager'
 import {
+  ALLOWED_PACKAGE_MANAGERS,
+  allowedPackageManagersString,
   getPartialEnvWithNpmPath,
   type PackageManager,
 } from '../../packageManager/packageManagerChoice'
@@ -133,6 +135,7 @@ export default async function initSanity(
   const useGit = typeof commitMessage === 'undefined' ? true : Boolean(commitMessage)
   const bareOutput = cliFlags.bare
   const env = cliFlags.env
+  const packageManager = cliFlags['package-manager']
 
   let defaultConfig = cliFlags['dataset-default']
   let showDefaultConfigPrompt = !defaultConfig
@@ -458,8 +461,6 @@ export default async function initSanity(
 
     // eslint-disable-next-line no-process-exit
     process.exit(0)
-
-    return
   }
 
   // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -542,15 +543,35 @@ export default async function initSanity(
   // Bootstrap Sanity, creating required project files, manifests etc
   await bootstrapTemplate(templateOptions, context)
 
-  // Now for the slow part... installing dependencies
-  const pkgManager = await getPackageManagerChoice(outputPath, {
-    prompt,
-    interactive: unattended ? false : isInteractive,
-  })
+  let pkgManager: PackageManager
+
+  // If the user has specified a package manager, and it's allowed use that
+  if (packageManager && ALLOWED_PACKAGE_MANAGERS.includes(packageManager)) {
+    pkgManager = packageManager
+  } else {
+    // Otherwise, try to find the most optimal package manager to use
+    pkgManager = (
+      await getPackageManagerChoice(outputPath, {
+        prompt,
+        interactive: unattended ? false : isInteractive,
+      })
+    ).chosen
 
-  trace.log({step: 'selectPackageManager', selectedOption: pkgManager.chosen})
+    // only log warning if a package manager flag is passed
+    if (packageManager) {
+      output.warn(
+        chalk.yellow(
+          `Given package manager "${packageManager}" is not supported. Supported package managers are ${allowedPackageManagersString}.`,
+        ),
+      )
+      output.print(`Using ${pkgManager} as package manager`)
+    }
+  }
+
+  trace.log({step: 'selectPackageManager', selectedOption: pkgManager})
 
-  await installDeclaredPackages(outputPath, pkgManager.chosen, context)
+  // Now for the slow part... installing dependencies
+  await installDeclaredPackages(outputPath, pkgManager, context)
 
   // Try initializing a git repository
   if (useGit) {
@@ -585,7 +606,7 @@ export default async function initSanity(
     bun: 'bun dev',
     manual: 'npm run dev',
   }
-  const devCommand = devCommandMap[pkgManager.chosen]
+  const devCommand = devCommandMap[pkgManager]
 
   const isCurrentDir = outputPath === process.cwd()
   if (isCurrentDir) {

package/src/commands/init/initCommand.ts

@@ -3,6 +3,10 @@ import {detectFrameworkRecord, LocalFileSystemDetector} from '@vercel/fs-detecto
 
 import initPlugin from '../../actions/init-plugin/initPlugin'
 import initProject from '../../actions/init-project/initProject'
+import {
+  allowedPackageManagersString,
+  type PackageManager,
+} from '../../packageManager/packageManagerChoice'
 import {type CliCommandDefinition} from '../../types'
 
 const helpText = `
@@ -22,6 +26,7 @@ Options
   --project-plan <name> Optionally select a plan for a new project
   --coupon <name> Optionally select a coupon for a new project (cannot be used with --project-plan)
   --no-typescript Do not use TypeScript for template files
+  --package-manager <name> Specify which package manager to use [allowed: ${allowedPackageManagersString}]
 
 Examples
   # Initialize a new project, prompt for required information along the way
@@ -80,6 +85,8 @@ export interface InitFlags {
   'reconfigure'?: boolean
 
   'organization'?: string
+
+  'package-manager'?: PackageManager
 }
 
 export const initCommand: CliCommandDefinition<InitFlags> = {

package/src/packageManager/packageManagerChoice.ts

@@ -9,6 +9,11 @@ import {isInteractive} from '../util/isInteractive'
 
 export type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun' | 'manual'
 
+export const ALLOWED_PACKAGE_MANAGERS: PackageManager[] = ['npm', 'yarn', 'pnpm', 'bun', 'manual']
+export const allowedPackageManagersString = ALLOWED_PACKAGE_MANAGERS.map((pm) => `"${pm}"`).join(
+  ' | ',
+)
+
 const EXPERIMENTAL = ['bun']
 
 /**