diff options
Diffstat (limited to 'packages/upgrade')
-rw-r--r-- | packages/upgrade/package.json | 9 | ||||
-rw-r--r-- | packages/upgrade/src/actions/context.ts | 4 | ||||
-rw-r--r-- | packages/upgrade/src/messages.ts | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json index c396409e1..22894e641 100644 --- a/packages/upgrade/package.json +++ b/packages/upgrade/package.json @@ -22,21 +22,18 @@ "dev": "astro-scripts dev \"src/**/*.ts\"", "test": "astro-scripts test \"test/**/*.test.js\"" }, - "files": [ - "dist", - "upgrade.js" - ], + "files": ["dist", "upgrade.js"], "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.", "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES", "dependencies": { "@astrojs/cli-kit": "^0.4.1", "semver": "^7.6.2", - "which-pm-runs": "^1.1.0", + "preferred-pm": "^3.1.3", "terminal-link": "^3.0.0" }, "devDependencies": { "@types/semver": "^7.5.8", - "@types/which-pm-runs": "^1.0.2", + "@types/preferred-pm": "^3.0.0", "arg": "^5.0.2", "astro-scripts": "workspace:*", "strip-ansi": "^7.1.0" diff --git a/packages/upgrade/src/actions/context.ts b/packages/upgrade/src/actions/context.ts index 775c552c0..9c229a363 100644 --- a/packages/upgrade/src/actions/context.ts +++ b/packages/upgrade/src/actions/context.ts @@ -1,7 +1,7 @@ import { pathToFileURL } from 'node:url'; import { prompt } from '@astrojs/cli-kit'; import arg from 'arg'; -import detectPackageManager from 'which-pm-runs'; +import detectPackageManager from 'preferred-pm'; export interface Context { help: boolean; @@ -38,7 +38,7 @@ export async function getContext(argv: string[]): Promise<Context> { { argv, permissive: true } ); - const packageManager = detectPackageManager()?.name ?? 'npm'; + const packageManager = (await detectPackageManager(process.cwd()))?.name ?? 'npm'; const { _: [version = 'latest'] = [], '--help': help = false, diff --git a/packages/upgrade/src/messages.ts b/packages/upgrade/src/messages.ts index 4f396422e..4fe181094 100644 --- a/packages/upgrade/src/messages.ts +++ b/packages/upgrade/src/messages.ts @@ -1,8 +1,8 @@ /* eslint no-console: 'off' */ import { color, label, spinner as load } from '@astrojs/cli-kit'; import { align } from '@astrojs/cli-kit/utils'; +import detectPackageManager from 'preferred-pm'; import terminalLink from 'terminal-link'; -import detectPackageManager from 'which-pm-runs'; import type { PackageInfo } from './actions/context.js'; import { shell } from './shell.js'; @@ -14,7 +14,7 @@ let _registry: string; export async function getRegistry(): Promise<string> { if (_registry) return _registry; const fallback = 'https://registry.npmjs.org'; - const packageManager = detectPackageManager()?.name || 'npm'; + const packageManager = (await detectPackageManager(process.cwd()))?.name || 'npm'; try { const { stdout } = await shell(packageManager, ['config', 'get', 'registry']); _registry = stdout?.trim()?.replace(/\/$/, '') || fallback; |