@camox/cli 0.28.3 → 0.28.5

package/dist/index.mjs

@@ -635,22 +635,76 @@ async function handler$6(args) {
 }
 //#endregion
 //#region src/lib/utils.ts
+const packageManagerVersions = {
+	pnpm: "pnpm@11.1.3",
+	bun: "bun@1.2.23",
+	npm: "npm@11.6.2",
+	yarn: "yarn@4.9.2"
+};
 const pmCommands = {
 	pnpm: {
-		install: "pnpm install",
-		dev: "pnpm dev"
+		install: {
+			bin: "corepack",
+			args: ["pnpm", "install"],
+			display: "pnpm install",
+			fallback: {
+				bin: "pnpm",
+				args: ["install"]
+			}
+		},
+		dev: {
+			bin: "corepack",
+			args: ["pnpm", "dev"],
+			display: "pnpm dev",
+			fallback: {
+				bin: "pnpm",
+				args: ["dev"]
+			}
+		}
 	},
 	bun: {
-		install: "bun install",
-		dev: "bun dev"
+		install: {
+			bin: "bun",
+			args: ["install"],
+			display: "bun install"
+		},
+		dev: {
+			bin: "bun",
+			args: ["dev"],
+			display: "bun dev"
+		}
 	},
 	npm: {
-		install: "npm install",
-		dev: "npm run dev"
+		install: {
+			bin: "npm",
+			args: ["install"],
+			display: "npm install"
+		},
+		dev: {
+			bin: "npm",
+			args: ["run", "dev"],
+			display: "npm run dev"
+		}
 	},
 	yarn: {
-		install: "yarn install",
-		dev: "yarn dev"
+		install: {
+			bin: "corepack",
+			args: ["yarn", "install"],
+			display: "yarn install",
+			fallback: {
+				bin: "yarn",
+				args: ["install"]
+			}
+		},
+		dev: {
+			bin: "corepack",
+			args: ["yarn", "dev"],
+			display: "yarn dev",
+			fallback: {
+				bin: "yarn",
+				args: ["dev"]
+			}
+		}
 	}
 };
 function copyDir(src, dest, replacements) {
@@ -673,16 +727,27 @@ const parser$5 = command("init", object({ command: constant("init") }));
 const handler$5 = init;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const ownPkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, "..", "package.json"), "utf-8"));
-const PNPM_VERSION = "11.1.3";
 const PNPM_WORKSPACE = `allowBuilds:
   core-js: true
   msw: true
   protobufjs: true
 `;
+var CommandError = class extends Error {
+	constructor(message, cause) {
+		super(message);
+		this.cause = cause;
+	}
+};
 function onCancel() {
 	p.cancel("Cancelled.");
 	process.exit(0);
 }
+function versionFromSpecifier(specifier, dependency) {
+	if (typeof specifier !== "string") throw new Error(`Expected ${dependency} to use a string version specifier.`);
+	const match = specifier.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?/);
+	if (match) return match[0];
+	throw new Error(`Could not infer a concrete version from ${dependency}@${specifier}.`);
+}
 function runCommand(bin, args, cwd) {
 	return new Promise((resolve, reject) => {
 		const child = spawn(bin, args, {
@@ -693,9 +758,53 @@ function runCommand(bin, args, cwd) {
 			if (code === 0) resolve();
 			else reject(/* @__PURE__ */ new Error(`Exit code ${code}`));
 		});
-		child.on("error", reject);
+		child.on("error", (err) => reject(new CommandError(`Failed to start ${bin}`, err)));
+	});
+}
+function spawnCommand(bin, args, cwd) {
+	return spawn(bin, args, {
+		cwd,
+		stdio: "inherit",
+		detached: true
+	});
+}
+function isMissingCommandError(err) {
+	if (!(err instanceof CommandError)) return false;
+	const cause = err.cause;
+	if (!(cause instanceof Error) || "code" in cause === false) return false;
+	return cause.code === "ENOENT";
+}
+async function runPackageManagerCommand(command, cwd) {
+	try {
+		await runCommand(command.bin, command.args, cwd);
+	} catch (err) {
+		if (!isMissingCommandError(err) || !command.fallback) throw err;
+		await runCommand(command.fallback.bin, command.fallback.args, cwd);
+	}
+}
+function startPackageManagerCommand(command, cwd) {
+	return new Promise((resolve, reject) => {
+		const child = spawnCommand(command.bin, command.args, cwd);
+		child.once("spawn", () => resolve(child));
+		child.once("error", (err) => {
+			const commandError = new CommandError(`Failed to start ${command.bin}`, err);
+			if (!isMissingCommandError(commandError) || !command.fallback) {
+				reject(commandError);
+				return;
+			}
+			const fallback = spawnCommand(command.fallback.bin, command.fallback.args, cwd);
+			fallback.once("spawn", () => resolve(fallback));
+			fallback.once("error", (fallbackErr) => reject(new CommandError(`Failed to start ${command.fallback?.bin}`, fallbackErr)));
+		});
 	});
 }
+function getCommandFailureMessage(pm, err) {
+	if (!isMissingCommandError(err)) return "Failed to install dependencies.";
+	if (pm === "pnpm") return "Corepack or pnpm is required to install dependencies with the selected package manager. Enable Corepack with `corepack enable` or install pnpm, then run the setup commands below.";
+	if (pm === "yarn") return "Corepack or Yarn is required to install dependencies with the selected package manager. Enable Corepack with `corepack enable` or install Yarn, then run the setup commands below.";
+	if (pm === "bun") return "Bun is required to install dependencies with the selected package manager. Install Bun, then run the setup commands below.";
+	return "npm is required to install dependencies. Install npm, then run the setup commands below.";
+}
 const CREATE_NEW_ORG = "__create_new__";
 async function selectOrCreateOrganization(token) {
 	const orgs = await listOrganizations(token);
@@ -833,7 +942,11 @@ async function init() {
 	pkg.name = project.slug;
 	delete pkg.version;
 	pkg.dependencies.camox = `^${ownPkg.version}`;
-	if (pm === "pnpm") pkg.packageManager = `pnpm@${PNPM_VERSION}`;
+	pkg.packageManager = packageManagerVersions[pm];
+	if (pm === "yarn") {
+		const vitePlusVersion = versionFromSpecifier(pkg.devDependencies["vite-plus"], "vite-plus");
+		pkg.devDependencies.vite = `npm:@voidzero-dev/vite-plus-core@${vitePlusVersion}`;
+	}
 	fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
 	if (pm === "pnpm") fs.writeFileSync(path.join(targetDir, "pnpm-workspace.yaml"), PNPM_WORKSPACE);
 	fs.writeFileSync(path.join(targetDir, ".env"), `CAMOX_SYNC_SECRET=${project.syncSecret}\n`);
@@ -860,25 +973,26 @@ src/routeTree.gen.ts
 `);
 	s.stop("Project scaffolded!");
 	const { install: installCmd, dev: devCmd } = pmCommands[pm];
-	const [installBin, ...installArgs] = installCmd.split(" ");
 	const s2 = p.spinner();
-	s2.start(`Running ${installCmd}...`);
+	s2.start(`Running ${installCmd.display}...`);
 	try {
-		await runCommand(installBin, installArgs, targetDir);
+		await runPackageManagerCommand(installCmd, targetDir);
 		s2.stop("Dependencies installed!");
-	} catch {
+	} catch (err) {
 		s2.stop("Install failed.");
-		p.log.error(`Failed to install dependencies.`);
-		p.outro(`To finish setup:\n  cd ${resolvedPath}\n  ${installCmd}\n  ${devCmd}`);
+		p.log.error(getCommandFailureMessage(pm, err));
+		p.outro(`To finish setup:\n  cd ${resolvedPath}\n  ${installCmd.display}\n  ${devCmd.display}`);
 		process.exit(1);
 	}
 	p.log.info(`Starting dev server... (Ctrl+C to stop)`);
-	const [cmd, ...args] = devCmd.split(" ");
-	const child = spawn(cmd, args, {
-		cwd: targetDir,
-		stdio: "inherit",
-		detached: true
-	});
+	let child;
+	try {
+		child = await startPackageManagerCommand(devCmd, targetDir);
+	} catch (err) {
+		p.log.error(getCommandFailureMessage(pm, err));
+		p.outro(`To start the dev server:\n  cd ${resolvedPath}\n  ${devCmd.display}`);
+		process.exit(1);
+	}
 	const sigintHandler = () => {
 		if (child.pid) try {
 			process.kill(-child.pid, "SIGTERM");
@@ -889,7 +1003,7 @@ src/routeTree.gen.ts
 	child.on("close", () => {
 		process.removeListener("SIGINT", sigintHandler);
 		process.removeListener("exit", sigintHandler);
-		p.outro(`To restart the dev server:\n  cd ${resolvedPath}\n  ${devCmd}`);
+		p.outro(`To restart the dev server:\n  cd ${resolvedPath}\n  ${devCmd.display}`);
 		process.exit(0);
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camox/cli",
-  "version": "0.28.3",
+  "version": "0.28.5",
   "bin": {
     "camox": "./dist/index.mjs"
   },
@@ -26,7 +26,7 @@
     "@types/node": "^24.12.4",
     "@typescript/native-preview": "7.0.0-dev.20260412.1",
     "vite-plus": "^0.1.21",
-    "@camox/api-contract": "0.28.3"
+    "@camox/api-contract": "0.28.5"
   },
   "nx": {
     "tags": [