next: Upgrade package-manager-detector to v0.2.2 (#1319)

Co-authored-by: Hunter Johnston <johnstonhuntera@gmail.com>

packages/cli/package.json

@@ -52,7 +52,7 @@
 		"cross-env": "^7.0.3",
 		"get-tsconfig": "^4.7.3",
 		"ignore": "^5.3.1",
-		"package-manager-detector": "^0.1.2",
+		"package-manager-detector": "^0.2.2",
 		"sisteransi": "^1.0.5",
 		"tsup": "^8.0.0",
 		"type-fest": "^3.13.1",

packages/cli/src/commands/add.ts

@@ -13,6 +13,7 @@ import { intro, prettifyList } from "../utils/prompt-helpers.js";
 import * as p from "../utils/prompts.js";
 import * as registry from "../utils/registry/index.js";
 import { transformImports } from "../utils/transformers.js";
+import { resolveCommand } from "package-manager-detector/commands";
 
 const highlight = (...args: unknown[]) => color.bold.cyan(...args);
 
@@ -266,14 +267,15 @@ async function runAdd(cwd: string, config: cliConfig.Config, options: AddOptions
 	}
 
 	// Install dependencies.
-	const commands = await detectPM(cwd, options.deps);
-	if (commands) {
-		const [pm, add] = commands.add.split(" ") as [string, string];
+	const pm = await detectPM(cwd, options.deps);
+	if (pm) {
+		const add = resolveCommand(pm, "add", ["-D", ...dependencies]);
+		if (!add) throw error(`Could not detect a package manager in ${cwd}.`);
 		tasks.push({
 			title: `${highlight(pm)}: Installing dependencies`,
 			enabled: dependencies.size > 0,
 			async task() {
-				await execa(pm, [add, "-D", ...dependencies], {
+				await execa(add.command, [...add.args], {
 					cwd,
 				});
 				return `Dependencies installed with ${highlight(pm)}`;

packages/cli/src/commands/init.ts

@@ -20,6 +20,7 @@ import * as registry from "../utils/registry/index.js";
 import { resolveImport } from "../utils/resolve-imports.js";
 import { syncSvelteKit } from "../utils/sveltekit.js";
 import * as templates from "../utils/templates.js";
+import { resolveCommand } from "package-manager-detector/commands";
 
 const PROJECT_DEPENDENCIES = [
 	"tailwind-variants",
@@ -410,14 +411,15 @@ export async function runInit(cwd: string, config: Config, options: InitOptions)
 	});
 
 	// Install dependencies.
-	const commands = await detectPM(cwd, options.deps);
-	if (commands) {
-		const [pm, add] = commands.add.split(" ") as [string, string];
+	const pm = await detectPM(cwd, options.deps);
+	if (pm) {
+		const add = resolveCommand(pm, "add", ["-D", ...PROJECT_DEPENDENCIES]);
+		if (!add) throw error(`Could not detect a package manager in ${cwd}.`);
 		tasks.push({
 			title: `${highlight(pm)}: Installing dependencies`,
 			enabled: options.deps,
 			async task() {
-				await execa(pm, [add, "-D", ...PROJECT_DEPENDENCIES], {
+				await execa(add.command, [...add.args], {
 					cwd,
 				});
 				return `Dependencies installed with ${highlight(pm)}`;

packages/cli/src/commands/update.ts

@@ -14,6 +14,7 @@ import * as p from "../utils/prompts.js";
 import * as registry from "../utils/registry/index.js";
 import { UTILS, UTILS_JS } from "../utils/templates.js";
 import { transformImports } from "../utils/transformers.js";
+import { resolveCommand } from "package-manager-detector/commands";
 
 const highlight = (msg: string) => color.bold.cyan(msg);
 
@@ -230,14 +231,15 @@ async function runUpdate(cwd: string, config: cliConfig.Config, options: UpdateO
 	}
 
 	// Install dependencies.
-	const commands = await detectPM(cwd, true);
-	if (commands) {
-		const [pm, add] = commands.add.split(" ") as [string, string];
+	const pm = await detectPM(cwd, true);
+	if (pm) {
+		const add = resolveCommand(pm, "add", ["-D", ...dependencies]);
+		if (!add) throw error(`Could not detect a package manager in ${cwd}.`);
 		tasks.push({
 			title: `${highlight(pm)}: Installing dependencies`,
 			enabled: dependencies.size > 0,
 			async task() {
-				await execa(pm, [add, "-D", ...dependencies], {
+				await execa(add.command, [...add.args], {
 					cwd,
 				});
 				return `Dependencies installed with ${highlight(pm)}`;

packages/cli/src/utils/auto-detect.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 import ignore, { type Ignore } from "ignore";
 import { type TsConfigResult, getTsconfig } from "get-tsconfig";
 import { detect } from "package-manager-detector";
-import { AGENTS, type Agent, COMMANDS } from "package-manager-detector/agents";
+import { AGENTS, type Agent } from "package-manager-detector";
 import * as p from "./prompts.js";
 import { cancel } from "./prompt-helpers.js";
 
@@ -97,10 +97,14 @@ export function detectLanguage(cwd: string): DetectLanguageResult | undefined {
 }
 
 type Options = Array<{ value: Agent | undefined; label: Agent | "None" }>;
-export async function detectPM(cwd: string, prompt: boolean) {
-	let { agent } = await detect({ cwd });
-
-	if (agent === undefined && prompt) {
+export async function detectPM(cwd: string, prompt: boolean): Promise<Agent | undefined> {
+	const detectResult = await detect({ cwd });
+
+	let agent: Agent | undefined;
+	if (detectResult != null) {
+		agent = detectResult.agent;
+	} else if (detectResult == null && prompt) {
+		// prompt for package manager
 		const options: Options = AGENTS.filter((agent) => !agent.includes("@")).map((pm) => ({
 			value: pm,
 			label: pm,
@@ -118,5 +122,5 @@ export async function detectPM(cwd: string, prompt: boolean) {
 		agent = res;
 	}
 
-	return agent ? COMMANDS[agent] : undefined;
+	return agent;
 }

packages/cli/src/utils/get-config.ts

@@ -111,8 +111,8 @@ export async function resolveConfigPaths(cwd: string, config: RawConfig) {
 		);
 	}
 
-	const utilsPath = resolveImport(config.aliases.utils, pathAliases);
-	const componentsPath = resolveImport(config.aliases.components, pathAliases);
+	let utilsPath = resolveImport(config.aliases.utils, pathAliases);
+	let componentsPath = resolveImport(config.aliases.components, pathAliases);
 	const hooksPath = resolveImport(config.aliases.hooks, pathAliases);
 	const uiPath = resolveImport(config.aliases.ui, pathAliases);
 
@@ -126,6 +126,9 @@ export async function resolveConfigPaths(cwd: string, config: RawConfig) {
 	if (utilsPath === undefined) throw aliasError("utils", config.aliases.utils);
 	if (componentsPath === undefined) throw aliasError("components", config.aliases.components);
 
+	utilsPath = path.normalize(utilsPath);
+	componentsPath = path.normalize(componentsPath);
+
 	return v.parse(configSchema, {
 		...config,
 		resolvedPaths: {

packages/cli/src/utils/sveltekit.ts

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { execa } from "execa";
-import { detect } from "package-manager-detector";
-import { COMMANDS } from "package-manager-detector/agents";
+import { detect, resolveCommand } from "package-manager-detector";
 import { loadProjectPackageInfo } from "./get-package-info.js";
 
 // if it's a SvelteKit project, run `svelte-kit sync` if the `.svelte-kit` dir is missing
@@ -12,11 +11,16 @@ export async function syncSvelteKit(cwd: string) {
 		// we'll exit early since syncing is rather slow
 		if (fs.existsSync(path.join(cwd, ".svelte-kit"))) return;
 
-		const { agent } = await detect({ cwd });
-		const [pm] = COMMANDS[agent ?? "npm"].agent.split(" ") as [string];
-		await execa(pm === "npm" ? "npx" : pm, ["svelte-kit", "sync"], {
-			cwd,
-		});
+		let agent = await detect({ cwd });
+
+		agent ??= { agent: "npm", name: "npm" };
+
+		const cmd = resolveCommand(agent.agent, "execute", ["svelte-kit", "sync"]);
+		if (cmd) {
+			await execa(cmd.command, cmd.args, {
+				cwd,
+			});
+		}
 	}
 }
 

packages/cli/test/utils/get-config.spec.ts

@@ -176,7 +176,9 @@ describe("getConfig", () => {
 	});
 
 	it("handles cases where the project uses jsconfig.json", async () => {
-		expect(await getConf("config-jsconfig")).toEqual({
+		const config = await getConf("config-jsconfig");
+
+		expect(config).toEqual({
 			style: "new-york",
 			tailwind: {
 				config: "tailwind.config.js",