Use resolveCommand for futureproofing (reverted accidental merge)

Author: garikAsplund

packages/migrate/migrations/app-state/index.js

@@ -6,7 +6,7 @@ import semver from 'semver';
 import glob from 'tiny-glob/sync.js';
 import { bail, check_git, migration_succeeded, update_svelte_file } from '../../utils.js';
 import { transform_svelte_code, update_pkg_json } from './migrate.js';
-import { detect } from 'package-manager-detector';
+import { detect, resolveCommand } from 'package-manager-detector';
 
 export async function migrate() {
 	if (!fs.existsSync('package.json')) {
@@ -97,8 +97,13 @@ export async function migrate() {
 
 	const detected = await detect({ cwd: process.cwd() });
 	const pm = detected?.name ?? 'npm';
+	const cmd = /** @type {import('package-manager-detector').ResolvedCommand} */ (
+		resolveCommand(pm, 'install', [])
+	);
 
-	const tasks = [`Install the updated dependencies by running ${cyan(`${pm} install`)}`];
+	const tasks = [
+		`Install the updated dependencies by running ${cyan(`${cmd.command} ${cmd.args.join(' ')}`)}`
+	];
 	if (use_git) {
 		tasks.push(cyan('git commit -m "migration to $app/state"'));
 		tasks.push(`Run ${cyan('git diff')} to review changes.`);

packages/migrate/migrations/svelte-5/index.js

@@ -18,7 +18,7 @@ import {
 import { migrate as migrate_svelte_4 } from '../svelte-4/index.js';
 import { migrate as migrate_sveltekit_2 } from '../sveltekit-2/index.js';
 import { transform_module_code, transform_svelte_code, update_pkg_json } from './migrate.js';
-import { detect } from 'package-manager-detector';
+import { detect, resolveCommand } from 'package-manager-detector';
 
 export async function migrate() {
 	if (!fs.existsSync('package.json')) {
@@ -212,9 +212,11 @@ export async function migrate() {
 
 	const detected = await detect({ cwd: process.cwd() });
 	const pm = detected?.name ?? 'npm';
-
+	const cmd = /** @type {import('package-manager-detector').ResolvedCommand} */ (
+		resolveCommand(pm, 'install', [])
+	);
 	const tasks = [
-		`Install the updated dependencies by running ${cyan(`${pm} install`)} ` +
+		`Install the updated dependencies by running ${cyan(`${cmd.command} ${cmd.args.join(' ')}`)} ` +
 			'(note that there may be peer dependency issues when not all your libraries officially support Svelte 5 yet. In this case try installing with the --force option)',
 		use_git && cyan('git commit -m "migration to Svelte 5"'),
 		'Review the migration guide at https://svelte.dev/docs/svelte/v5-migration-guide',

packages/migrate/migrations/sveltekit-2/index.js

@@ -19,7 +19,7 @@ import {
 	update_svelte_config,
 	update_tsconfig_content
 } from './migrate.js';
-import { detect } from 'package-manager-detector';
+import { detect, resolveCommand } from 'package-manager-detector';
 
 export async function migrate() {
 	if (!fs.existsSync('package.json')) {
@@ -140,9 +140,12 @@ export async function migrate() {
 
 	const detected = await detect({ cwd: process.cwd() });
 	const pm = detected?.name ?? 'npm';
+	const cmd = /** @type {import('package-manager-detector').ResolvedCommand} */ (
+		resolveCommand(pm, 'install', [])
+	);
 
 	const tasks = [
-		`Install the updated dependencies by running ${cyan(`${pm} install`)}`,
+		`Install the updated dependencies by running ${cyan(`${cmd.command} ${cmd.args.join(' ')}`)}`,
 		use_git && cyan('git commit -m "migration to SvelteKit 2"'),
 		'Review the migration guide at https://svelte.dev/docs/kit/migrating-to-sveltekit-2',
 		'Read the updated docs at https://svelte.dev/docs/kit',