diff --git a/packages/devtools/package.json b/packages/devtools/package.json index c04b80bb57..856930a171 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -69,7 +69,6 @@ "launch-editor": "catalog:prod", "local-pkg": "catalog:prod", "magicast": "catalog:prod", - "nypm": "catalog:prod", "ohash": "catalog:frontend", "pathe": "catalog:frontend", "perfect-debounce": "catalog:frontend", @@ -120,6 +119,7 @@ "nitropack": "catalog:buildtools", "nuxt": "catalog:buildtools", "ofetch": "catalog:frontend", + "package-manager-detector": "catalog:inlined", "quicktype-core": "catalog:frontend", "scule": "catalog:frontend", "shiki": "catalog:frontend", diff --git a/packages/devtools/src/server-rpc/npm.ts b/packages/devtools/src/server-rpc/npm.ts index f695de1e44..6f78d0cf73 100644 --- a/packages/devtools/src/server-rpc/npm.ts +++ b/packages/devtools/src/server-rpc/npm.ts @@ -1,19 +1,19 @@ -import type { PackageManager } from 'nypm' +import type { DetectResult } from 'package-manager-detector/detect' import type { NpmCommandOptions, NpmCommandType, NuxtDevtoolsServerContext, PackageUpdateInfo, ServerFunctions } from '../types' import fs from 'node:fs/promises' import { startSubprocess } from '@nuxt/devtools-kit' import { parseModule } from 'magicast' import { addNuxtModule, getDefaultExportOptions } from 'magicast/helpers' -import { detectPackageManager } from 'nypm' +import { detect } from 'package-manager-detector/detect' import { checkForUpdateOf } from '../npm' import { magicastGuard } from '../utils/magicast' export function setupNpmRPC({ nuxt, ensureDevAuthToken }: NuxtDevtoolsServerContext) { - let detectPromise: Promise | undefined + let detectPromise: Promise | undefined const updatesPromise = new Map>() function getPackageManager() { - detectPromise ||= detectPackageManager(nuxt.options.rootDir) + detectPromise ||= detect({ cwd: nuxt.options.rootDir }) return detectPromise } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9a0c90d61..e3bf36f3e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -276,6 +276,10 @@ catalogs: '@iconify-json/tabler': specifier: ^1.2.31 version: 1.2.31 + inlined: + package-manager-detector: + specifier: ^1.6.0 + version: 1.6.0 playground: '@exampledev/new.css': specifier: ^1.1.3 @@ -314,9 +318,6 @@ catalogs: magicast: specifier: ^0.5.2 version: 0.5.2 - nypm: - specifier: ^0.6.5 - version: 0.6.5 pkg-types: specifier: ^2.3.0 version: 2.3.0 @@ -535,9 +536,6 @@ importers: magicast: specifier: catalog:prod version: 0.5.2 - nypm: - specifier: catalog:prod - version: 0.6.5 ohash: specifier: catalog:frontend version: 2.0.11 @@ -686,6 +684,9 @@ importers: ofetch: specifier: catalog:frontend version: 1.5.1 + package-manager-detector: + specifier: catalog:inlined + version: 1.6.0 quicktype-core: specifier: catalog:frontend version: 22.0.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index bcd2a68fff..98143591ea 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -110,6 +110,8 @@ catalogs: '@iconify-json/ri': ^1.2.10 '@iconify-json/simple-icons': ^1.2.74 '@iconify-json/tabler': ^1.2.31 + inlined: + package-manager-detector: ^1.6.0 playground: '@exampledev/new.css': ^1.1.3 prod: @@ -124,7 +126,6 @@ catalogs: launch-editor: ^2.13.1 local-pkg: ^1.1.2 magicast: ^0.5.2 - nypm: ^0.6.5 pkg-types: ^2.3.0 semver: ^7.7.4 sirv: ^3.0.2