@rebasepro/cli 0.9.1-canary.e2fc7b6 → 0.9.1-canary.eab7ae2

package/dist/index.es.js

@@ -9,8 +9,8 @@ import { execa, execaCommandSync } from "execa";
 import { cp } from "fs/promises";
 import { fileURLToPath } from "url";
 import crypto from "crypto";
+import { execSync, spawn, spawnSync } from "child_process";
 import os from "os";
-import { execSync, spawn } from "child_process";
 import { createRebaseClient } from "@rebasepro/client";
 import { generateSDK } from "@rebasepro/codegen";
 import { createRequire } from "module";
@@ -23,28 +23,45 @@ import { createRequire } from "module";
 * the rest of the CLI never has to hardcode a specific PM.
 */
 /**
-* Detect the package manager from the environment or the target directory.
+* Whether pnpm is runnable on this machine.
+*
+* Used to decide whether a fresh project can be scaffolded with pnpm. Kept
+* cheap and non-interactive (short timeout, output discarded) so it never
+* hangs detection if a corepack shim misbehaves.
+*/
+function isPnpmAvailable() {
+	try {
+		return spawnSync("pnpm", ["--version"], {
+			stdio: "ignore",
+			timeout: 3e3
+		}).status === 0;
+	} catch {
+		return false;
+	}
+}
+/**
+* Detect the package manager for a Rebase project.
+*
+* Rebase recommends pnpm, so detection prefers it. Crucially, *how the CLI was
+* invoked* (`npx` vs `pnpm dlx`, i.e. `npm_config_user_agent`) is deliberately
+* ignored: running `npx @rebasepro/cli init` says nothing about how the user
+* wants to manage the project they're creating, and letting it pin the scaffold
+* to npm is what made every `npx`-invoked project an npm project.
 *
 * Detection order:
-* 1. Explicit override (if provided)
-* 2. `npm_config_user_agent` env var (set by npm/pnpm when running via `npx`/`pnpm dlx`)
-* 3. Lock-file presence in the target directory
-* 4. Default to pnpm (Rebase's recommended PM)
+* 1. An existing lock file — an explicit choice we always respect
+*    (`pnpm-lock.yaml` wins over `package-lock.json` when both are present).
+* 2. pnpm, whenever it is installed.
+* 3. npm, only as a fallback when pnpm is genuinely unavailable.
 */
 function detectPackageManager(targetDir) {
-	const userAgent = process.env.npm_config_user_agent ?? "";
-	if (userAgent.startsWith("npm/")) return "npm";
-	if (userAgent.startsWith("pnpm/")) return "pnpm";
-	if (targetDir) {
-		if (fs.existsSync(path.join(targetDir, "package-lock.json"))) return "npm";
-		if (fs.existsSync(path.join(targetDir, "pnpm-lock.yaml"))) return "pnpm";
+	const dirs = [targetDir, process.cwd()].filter((d) => !!d);
+	for (const dir of dirs) {
+		if (fs.existsSync(path.join(dir, "pnpm-lock.yaml"))) return "pnpm";
+		if (fs.existsSync(path.join(dir, "package-lock.json"))) return "npm";
 	}
-	const cwd = process.cwd();
-	if (cwd !== targetDir) {
-		if (fs.existsSync(path.join(cwd, "package-lock.json"))) return "npm";
-		if (fs.existsSync(path.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-	}
-	return "pnpm";
+	if (isPnpmAvailable()) return "pnpm";
+	return "npm";
 }
 /** Build the command helpers for a given package manager. */
 function getPMCommands(pm) {
@@ -118,7 +135,8 @@ function getPMCommands(pm) {
 		runWorkspace: (workspace, script) => [
 			"pnpm",
 			"--filter",
-			workspace,
+			`./${workspace}`,
+			"run",
 			script
 		],
 		dlx: (pkg, args) => [
@@ -5665,6 +5683,6 @@ ${chalk.gray("Documentation: https://rebase.pro/docs")}
 `);
 }
 //#endregion
-export { authCommand, buildCommand, buildInitQuestions, cloudCommand, configureEnvFile, createRebaseApp, dbCommand, detectPackageManager, devCommand, doctorCommand, entry, findBackendDir, findEnvFile, findFrontendDir, findProjectRoot, generateSdkCommand, getActiveBackendPlugin, getPMCommands, requireBackendDir, requireProjectRoot, resolveLocalBin, resolvePluginCliScript, resolveTsx, schemaCommand, startCommand, validateProjectName, validateTsxInstallation };
+export { authCommand, buildCommand, buildInitQuestions, cloudCommand, configureEnvFile, createRebaseApp, dbCommand, detectPackageManager, devCommand, doctorCommand, entry, findBackendDir, findEnvFile, findFrontendDir, findProjectRoot, generateSdkCommand, getActiveBackendPlugin, getPMCommands, isPnpmAvailable, requireBackendDir, requireProjectRoot, resolveLocalBin, resolvePluginCliScript, resolveTsx, schemaCommand, startCommand, validateProjectName, validateTsxInstallation };
 
 //# sourceMappingURL=index.es.js.map