fix: auto install works with yarn berry, close #454

Author: antfu

packages/devtools-kit/src/_types/rpc.ts

@@ -3,7 +3,7 @@ import type { StorageMounts } from 'nitropack'
 import type { StorageValue } from 'unstorage'
 import type { ModuleOptions, NuxtDevToolsOptions } from './options'
 import type { ModuleCustomTab } from './custom-tabs'
-import type { AssetEntry, AssetInfo, AutoImportsWithMetadata, ComponentRelationship, HookInfo, ImageMeta, NpmCommandOptions, NpmCommandType, PackageManagerName, PackageUpdateInfo, ServerRouteInfo } from './integrations'
+import type { AssetEntry, AssetInfo, AutoImportsWithMetadata, ComponentRelationship, HookInfo, ImageMeta, NpmCommandOptions, NpmCommandType, PackageUpdateInfo, ServerRouteInfo } from './integrations'
 import type { TerminalAction, TerminalInfo } from './terminals'
 import type { GetWizardArgs, WizardActions } from './wizard'
 import type { AnalyzeBuildsInfo } from './analyze-build'
@@ -31,7 +31,6 @@ export interface ServerFunctions {
 
   // Updates
   checkForUpdateFor(name: string): Promise<PackageUpdateInfo | undefined>
-  getPackageManager(): Promise<PackageManagerName>
   getNpmCommand(command: NpmCommandType, packageName: string, options?: NpmCommandOptions): Promise<string[] | undefined>
   runNpmCommand(token: string, command: NpmCommandType, packageName: string, options?: NpmCommandOptions): Promise<{ processId: string } | undefined>
 

packages/devtools/src/server-rpc/npm.ts

@@ -1,18 +1,19 @@
 import fs from 'node:fs/promises'
 import { startSubprocess } from '@nuxt/devtools-kit'
 import isInstalledGlobally from 'is-installed-globally'
+import type { PackageManager } from 'nypm'
 import { detectPackageManager } from 'nypm'
 import { parseModule } from 'magicast'
 import { addNuxtModule, getDefaultExportOptions } from 'magicast/helpers'
 import { checkForUpdateOf } from '../npm'
-import type { NpmCommandOptions, NpmCommandType, NuxtDevtoolsServerContext, PackageManagerName, PackageUpdateInfo, ServerFunctions } from '../types'
+import type { NpmCommandOptions, NpmCommandType, NuxtDevtoolsServerContext, PackageUpdateInfo, ServerFunctions } from '../types'
 
 export function setupNpmRPC({ nuxt, ensureDevAuthToken }: NuxtDevtoolsServerContext) {
-  let detectPromise: Promise<PackageManagerName> | undefined
+  let detectPromise: Promise<PackageManager | undefined> | undefined
   const updatesPromise = new Map<string, Promise<PackageUpdateInfo | undefined>>()
 
   function getPackageManager() {
-    detectPromise ||= detectPackageManager(nuxt.options.rootDir).then(r => r?.name || 'npm')
+    detectPromise ||= detectPackageManager(nuxt.options.rootDir)
     return detectPromise
   }
 
@@ -23,12 +24,29 @@ export function setupNpmRPC({ nuxt, ensureDevAuthToken }: NuxtDevtoolsServerCont
     } = options
     const agent = await getPackageManager()
 
+    const name = agent?.name || 'npm'
+
     // TODO: smartly detect dev/global installs as default
-    if (command === 'install' || command === 'update')
-      return [agent, agent === 'npm' ? 'install' : 'add', `${packageName}@latest`, dev ? '-D' : '', global ? '-g' : '', '--ignore-scripts'].filter(Boolean)
+    if (command === 'install' || command === 'update') {
+      return [
+        name,
+        name === 'npm' ? 'install' : 'add',
+        `${packageName}@latest`,
+        dev ? '-D' : '',
+        global ? '-g' : '',
+        // In yarn berry, `--ignore-scripts` is removed
+        (name === 'yarn' && !agent?.version?.startsWith('1.')) ? '' : '--ignore-scripts',
+      ].filter(Boolean)
+    }
 
-    if (command === 'uninstall')
-      return [agent, agent === 'npm' ? 'uninstall' : 'remove', packageName, global ? '-g' : ''].filter(Boolean)
+    if (command === 'uninstall') {
+      return [
+        name,
+        name === 'npm' ? 'uninstall' : 'remove',
+        packageName,
+        global ? '-g' : '',
+      ].filter(Boolean)
+    }
   }
 
   async function runNpmCommand(command: NpmCommandType, packageName: string, options: NpmCommandOptions = {}) {
@@ -63,7 +81,6 @@ export function setupNpmRPC({ nuxt, ensureDevAuthToken }: NuxtDevtoolsServerCont
         updatesPromise.set(name, checkForUpdateOf(name, undefined, nuxt))
       return updatesPromise.get(name)!
     },
-    getPackageManager,
     getNpmCommand,
     async runNpmCommand(token, ...args) {
       await ensureDevAuthToken(token)