Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"launch-editor": "catalog:prod",
"local-pkg": "catalog:prod",
"magicast": "catalog:prod",
"nypm": "catalog:prod",
"ohash": "catalog:frontend",
"package-manager-detector": "catalog:prod",
"pathe": "catalog:frontend",
"perfect-debounce": "catalog:frontend",
"pkg-types": "catalog:prod",
Expand Down
48 changes: 29 additions & 19 deletions packages/devtools/src/server-rpc/npm.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import type { PackageManager } from 'nypm'
import type { DetectResult } from 'package-manager-detector'
import type { NpmCommandOptions, NpmCommandType, NuxtDevtoolsServerContext, PackageUpdateInfo, ServerFunctions } from '../types'
import { existsSync } from 'node:fs'
import fs from 'node:fs/promises'
import { startSubprocess } from '@nuxt/devtools-kit'
import isInstalledGlobally from 'is-installed-globally'
import { parseModule } from 'magicast'
import { addNuxtModule, getDefaultExportOptions } from 'magicast/helpers'
import { detectPackageManager } from 'nypm'
import { detect, resolveCommand } from 'package-manager-detector'
import { join } from 'pathe'
import { checkForUpdateOf } from '../npm'
import { magicastGuard } from '../utils/magicast'

export function setupNpmRPC({ nuxt, ensureDevAuthToken }: NuxtDevtoolsServerContext) {
let detectPromise: Promise<PackageManager | undefined> | undefined
let detectPromise: Promise<DetectResult | null> | undefined
const updatesPromise = new Map<string, Promise<PackageUpdateInfo | undefined>>()

function getPackageManager() {
detectPromise ||= detectPackageManager(nuxt.options.rootDir)
detectPromise ||= detect({ cwd: nuxt.options.rootDir }).catch(() => null)
return detectPromise
}

Expand All @@ -23,30 +25,38 @@ export function setupNpmRPC({ nuxt, ensureDevAuthToken }: NuxtDevtoolsServerCont
dev = true,
global = (packageName === '@nuxt/devtools' && isInstalledGlobally),
} = options
const agent = await getPackageManager()

const name = agent?.name || 'npm'
const detected = await getPackageManager()
const agent = detected?.agent || 'npm'
const name = agent === 'deno' ? `npm:${packageName}` : packageName
const pnpmFlags = agent === 'pnpm'
? [
...!global && existsSync(join(nuxt.options.rootDir, 'pnpm-workspace.yaml')) ? ['--workspace-root'] : [],
'--config.confirm-modules-purge=false',
'--config.strict-dep-builds=false',
]
: []

// TODO: smartly detect dev/global installs as default
if (command === 'install' || command === 'update') {
const resolved = global
? resolveCommand(agent, 'global', [`${name}@latest`])
: resolveCommand(agent, 'add', [`${name}@latest`, ...dev ? ['-D'] : []])
if (!resolved)
return
return [
name,
name === 'npm' ? 'install' : 'add',
`${packageName}@latest`,
dev ? '-D' : '',
global ? '-g' : '',
resolved.command,
...resolved.args,
...pnpmFlags,
// In yarn berry, `--ignore-scripts` is removed
(name === 'yarn' && !agent?.version?.startsWith('1.')) ? '' : '--ignore-scripts',
agent === 'yarn@berry' ? '' : '--ignore-scripts',
].filter(Boolean)
}

if (command === 'uninstall') {
return [
name,
name === 'npm' ? 'uninstall' : 'remove',
packageName,
global ? '-g' : '',
].filter(Boolean)
const resolved = resolveCommand(agent, global ? 'global_uninstall' : 'uninstall', [name])
if (!resolved)
return
return [resolved.command, ...resolved.args, ...pnpmFlags]
}
}

Expand Down
21 changes: 8 additions & 13 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ catalogs:
launch-editor: ^2.14.1
local-pkg: ^1.2.1
magicast: ^0.5.4
nypm: ^0.6.9
package-manager-detector: ^1.8.0
pkg-types: ^2.3.1
semver: ^7.8.5
simple-git: ^3.36.0
Expand Down
Loading