startx 1.1.0 → 1.1.2

package/apps/startx-cli/package.json

@@ -20,20 +20,21 @@
 	"author": "",
 	"license": "ISC",
 	"devDependencies": {
-		"cross-env": "^10.1.0",
+		"cross-env": "catalog:",
 		"eslint-config": "workspace:*",
 		"tsdown-config": "workspace:*",
 		"typescript-config": "workspace:*",
 		"vitest-config": "workspace:*"
 	},
 	"dependencies": {
-		"@inquirer/prompts": "^8.3.0",
+		"@inquirer/prompts": "catalog:",
 		"@repo/lib": "workspace:*",
 		"@repo/logger": "workspace:*",
 		"@repo/env": "workspace:*",
-		"chokidar": "^4.0.3",
-		"commander": "^14.0.0",
-		"type-fest": "^5.4.4"
+		"chokidar": "catalog:",
+		"commander": "catalog:",
+		"type-fest": "catalog:",
+		"yaml": "catalog:"
 	},
 	"startx": {
 		"mode": "silent",

package/apps/startx-cli/src/commands/package.ts

@@ -4,8 +4,10 @@ import { spawn } from "child_process";
 import { Command } from "commander";
 import fs from "fs/promises";
 import path from "path";
+import YAML from "yaml";
 import z from "zod";
 
+import { DepCheck } from "../configs/deps";
 import { FileCheck } from "../configs/files";
 import type { StartXPackageJson, TAGS } from "../types";
 import { CliUtils, type PackageItem } from "../utils/cli-utils";
@@ -15,6 +17,7 @@ import { CommonInquirer } from "../utils/inquirer";
 type PackageOptions = {
 	eslint?: boolean;
 	install?: boolean;
+	name?: string;
 };
 
 type NewPackageOptions = PackageOptions & {
@@ -39,11 +42,12 @@ export class PackageCommand {
 		)
 		.addCommand(
 			new Command("add")
-				.description("Add an existing StartX package by name.")
+				.description("Add an existing StartX app or package, optionally with a new name.")
 				.argument("[packageName]")
+				.option("-n, --name <name>", "override the name for the added package")
 				.option("--eslint", "enable ESLint support for the added package")
 				.option("--no-eslint", "skip ESLint support for the added package")
-				.option("--no-install", "do not run the package manager after updating ESLint")
+				.option("--no-install", "do not run the package manager after updating dependencies")
 				.action(PackageCommand.add.bind(PackageCommand))
 		)
 		.addCommand(
@@ -85,7 +89,7 @@ export class PackageCommand {
 		const selectedName =
 			packageName ??
 			(await CommonInquirer.choose({
-				message: "Select package to add",
+				message: "Select app or package to add",
 				options: availablePackages.map(pkg => pkg.name),
 				mode: "single",
 				required: true,
@@ -96,6 +100,16 @@ export class PackageCommand {
 			throw new Error(`Package "${selectedName}" was not found in the StartX template.`);
 		}
 
+		const templateName = selectedPackage.packageJson?.name ?? selectedPackage.name;
+		const overrideName =
+			options.name ??
+			(await CommonInquirer.getText({
+				message: "Name for the new package (leave unchanged to keep the original)",
+				name: "overrideName",
+				default: templateName,
+				schema: packageNameSchema,
+			}));
+
 		const directory = CliUtils.getDirectory();
 		const eslintEnabled = await this.resolveEslintPreference(options);
 		const packagesToInstall = this.resolvePackageClosure({
@@ -109,15 +123,24 @@ export class PackageCommand {
 			eslintEnabled,
 		});
 
+		await this.checkAndInstallMissingDeps({
+			workspace: directory.workspace,
+			tags,
+			install: options.install,
+		});
+
 		for (const pkg of packagesToInstall) {
+			const isMain = pkg.name === selectedPackage.name;
 			await this.installTemplatePackage({
 				pkg,
 				directory,
 				tags,
+				overrideName: isMain ? overrideName : undefined,
+				overrideRelativePath: isMain ? this.getDestinationPath(pkg.relativePath, overrideName) : undefined,
 			});
 		}
 
-		logger.info(`Package add complete: ${selectedPackage.name}`);
+		logger.info(`Done! Run \`pnpm install\` to link the new package.`);
 	}
 
 	private static async create(packageName: string | undefined, options: NewPackageOptions) {
@@ -136,8 +159,11 @@ export class PackageCommand {
 			throw new Error(`Package directory already exists: ${packageDir}`);
 		}
 
+		const rootPackage = await this.readRootPackage(directory.workspace);
 		const eslintEnabled = await this.resolveEslintPreference(options);
+		const vitestEnabled = this.hasDependency(rootPackage, "vitest");
 		const packages = await CliUtils.getPackageList();
+
 		await this.ensureTemplatePackage({
 			packages,
 			name: "typescript-config",
@@ -154,8 +180,20 @@ export class PackageCommand {
 			});
 		}
 
+		if (vitestEnabled) {
+			await this.ensureTemplatePackage({
+				packages,
+				name: "vitest-config",
+				directory,
+				tags: ["common", "node", "vitest"],
+			});
+		}
+
 		await fs.mkdir(path.join(packageDir, "src"), { recursive: true });
-		await this.writeJson(path.join(packageDir, "package.json"), this.createPackageJson({ name, eslintEnabled }));
+		await this.writeJson(
+			path.join(packageDir, "package.json"),
+			this.createPackageJson({ name, eslintEnabled, vitestEnabled })
+		);
 		await fs.writeFile(
 			path.join(packageDir, "tsconfig.json"),
 			`${JSON.stringify(
@@ -181,7 +219,15 @@ export class PackageCommand {
 			);
 		}
 
+		if (vitestEnabled) {
+			await fs.writeFile(
+				path.join(packageDir, "vitest.config.ts"),
+				`import vitestConfig from "vitest-config/node";\n\nexport default vitestConfig;\n`
+			);
+		}
+
 		logger.info(`Created package ${name} at ${path.relative(directory.workspace, packageDir)}`);
+		logger.info(`Run \`pnpm install\` to link the new package.`);
 	}
 
 	private static async resolveEslintPreference(options: PackageOptions) {
@@ -216,11 +262,7 @@ export class PackageCommand {
 		return true;
 	}
 
-	private static async getInstallTags(props: {
-		workspace: string;
-		packages: PackageItem[];
-		eslintEnabled: boolean;
-	}) {
+	private static async getInstallTags(props: { workspace: string; packages: PackageItem[]; eslintEnabled: boolean }) {
 		const tags = new Set<TAGS>(["common", "node"]);
 		const rootPackage = await this.readRootPackage(props.workspace);
 
@@ -228,6 +270,7 @@ export class PackageCommand {
 		if (this.hasDependency(rootPackage, "@biomejs/biome")) tags.add("biome");
 		if (this.hasDependency(rootPackage, "prettier")) tags.add("prettier");
 		if (this.hasDependency(rootPackage, "vitest")) tags.add("vitest");
+		if (this.hasDependency(rootPackage, "tsdown")) tags.add("tsdown");
 
 		for (const pkg of props.packages) {
 			pkg.packageJson?.startx?.tags?.forEach(tag => tags.add(tag));
@@ -295,15 +338,25 @@ export class PackageCommand {
 		pkg: PackageItem;
 		directory: ReturnType<typeof CliUtils.getDirectory>;
 		tags: TAGS[];
+		overrideName?: string;
+		overrideRelativePath?: string;
 	}) {
 		if (!props.pkg.packageJson) {
 			throw new Error(`Missing package.json for ${props.pkg.name}`);
 		}
 
-		const destination = path.join(props.directory.workspace, props.pkg.relativePath);
+		const relativePath = props.overrideRelativePath ?? props.pkg.relativePath;
+		const destination = path.join(props.directory.workspace, relativePath);
+
 		if (await this.pathExists(path.join(destination, "package.json"))) {
-			logger.info(`Skipping ${props.pkg.name}; it already exists.`);
-			return;
+			const overwrite = await CommonInquirer.confirm({
+				message: `"${relativePath}" already exists. Overwrite?`,
+				default: false,
+			});
+			if (!overwrite) {
+				logger.info(`Skipping ${props.pkg.name}.`);
+				return;
+			}
 		}
 
 		const tags = new Set<TAGS>([...props.tags, ...(props.pkg.packageJson.startx?.tags ?? [])]);
@@ -314,13 +367,18 @@ export class PackageCommand {
 		const { packageJson, isWorkspace } = FileHandler.handlePackageJson({
 			app: props.pkg.packageJson,
 			tags: Array.from(tags),
-			name: props.pkg.packageJson.name || props.pkg.name,
+			name: props.overrideName ?? props.pkg.packageJson.name ?? props.pkg.name,
 		});
 
 		if (isWorkspace) {
 			throw new Error(`Cannot install workspace as a package: ${props.pkg.name}`);
 		}
 
+		await this.syncDepsWithCatalog({
+			workspace: props.directory.workspace,
+			packageJson: packageJson as Record<string, unknown>,
+		});
+
 		await fsTool.writeJSONFile({ dir: destination, file: "package", content: packageJson });
 		await this.copyValidatedFilesFromFolder(props.pkg.path, destination, tags);
 		await fsTool.copyDirectory({
@@ -329,7 +387,7 @@ export class PackageCommand {
 			exclude: !tags.has("vitest") ? /\.test\.tsx?$/ : undefined,
 		});
 
-		logger.info(`Installed ${props.pkg.name}`);
+		logger.info(`Installed ${props.overrideName ?? props.pkg.name} at ${relativePath}`);
 	}
 
 	private static async copyValidatedFilesFromFolder(source: string, destination: string, tags: Set<TAGS>) {
@@ -346,7 +404,7 @@ export class PackageCommand {
 		}
 	}
 
-	private static createPackageJson(props: { name: string; eslintEnabled: boolean }) {
+	private static createPackageJson(props: { name: string; eslintEnabled: boolean; vitestEnabled: boolean }) {
 		const scripts: Record<string, string> = {
 			typecheck: "tsc --noEmit",
 			clean: "rimraf dist .turbo",
@@ -354,11 +412,21 @@ export class PackageCommand {
 		const devDependencies: Record<string, string> = {
 			"typescript-config": "workspace:*",
 		};
+		const ignore: string[] = [];
 
 		if (props.eslintEnabled) {
 			scripts.lint = "eslint .";
 			scripts["lint:fix"] = "eslint . --fix";
 			devDependencies["eslint-config"] = "workspace:*";
+		} else {
+			ignore.push("eslint-config");
+		}
+
+		if (props.vitestEnabled) {
+			scripts.test = "vitest run";
+			devDependencies["vitest-config"] = "workspace:*";
+		} else {
+			ignore.push("vitest-config");
 		}
 
 		return {
@@ -371,11 +439,62 @@ export class PackageCommand {
 			startx: {
 				iTags: ["node"],
 				requiredDevDeps: ["typescript-config"],
-				...(props.eslintEnabled ? {} : { ignore: ["eslint-config"] }),
+				...(ignore.length > 0 ? { ignore } : {}),
 			},
 		};
 	}
 
+	private static async checkAndInstallMissingDeps(props: { workspace: string; tags: TAGS[]; install?: boolean }) {
+		const rootPackage = await this.readRootPackage(props.workspace);
+		const pnpmWorkspace = await CliUtils.parsePnpmWorkspace({ dir: props.workspace });
+
+		const missing: Array<{ name: string; version: string; isDev: boolean }> = [];
+		for (const [dep, config] of Object.entries(DepCheck)) {
+			if (!config.tags.every(tag => props.tags.includes(tag))) continue;
+			if (config.tags.includes("root")) continue;
+			if (this.hasDependency(rootPackage, dep)) continue;
+			const version = pnpmWorkspace?.catalog?.[dep] ? "catalog:" : config.version;
+			missing.push({ name: dep, version, isDev: config.isDevDependency ?? true });
+		}
+
+		if (missing.length === 0) return;
+
+		logger.warn(`The following workspace dependencies are required but not installed:`);
+		for (const dep of missing) {
+			logger.warn(`  - ${dep.name}`);
+		}
+
+		const shouldAdd = await CommonInquirer.confirm({
+			message: "Add them to the workspace root package.json?",
+			default: true,
+		});
+		if (!shouldAdd) {
+			logger.warn("Skipping. Some features may not work correctly without these dependencies.");
+			return;
+		}
+
+		for (const dep of missing) {
+			if (dep.isDev) {
+				(rootPackage.devDependencies as Record<string, string>)[dep.name] = dep.version;
+			} else {
+				(rootPackage.dependencies as Record<string, string>)[dep.name] = dep.version;
+			}
+		}
+
+		await this.writeJson(path.join(props.workspace, "package.json"), rootPackage);
+		logger.info("Added missing dependencies to root package.json.");
+
+		if (props.install !== false) {
+			await this.installRootDependencies(props.workspace);
+		}
+	}
+
+	private static getDestinationPath(templateRelativePath: string, newName: string): string {
+		const parentDir = path.dirname(templateRelativePath);
+		const leafName = newName.includes("/") ? newName.split("/").pop()! : newName;
+		return path.join(parentDir, leafName);
+	}
+
 	private static getDefaultPackagePath(name: string) {
 		if (name.startsWith("@")) {
 			const [scope, packageName] = name.split("/");
@@ -438,6 +557,55 @@ export class PackageCommand {
 		});
 	}
 
+	private static async syncDepsWithCatalog(props: {
+		workspace: string;
+		packageJson: Record<string, unknown>;
+	}): Promise<void> {
+		const workspacePath = path.join(props.workspace, "pnpm-workspace.yaml");
+		let content: string;
+		try {
+			content = await fs.readFile(workspacePath, "utf-8");
+		} catch {
+			throw new Error(`Could not find workspace file at ${workspacePath}.`);
+		}
+
+		const doc = YAML.parseDocument(content);
+		const catalog = doc.getIn(["catalog"]) as Record<string, string> | undefined;
+		if (!catalog) return;
+
+		const deps = props.packageJson.dependencies as Record<string, string> | undefined;
+		const devDeps = props.packageJson.devDependencies as Record<string, string> | undefined;
+		const newEntries: Record<string, string> = {};
+
+		const processMap = (depMap: Record<string, string> | undefined) => {
+			if (!depMap) return;
+			for (const [name, version] of Object.entries(depMap)) {
+				if (version === "catalog:" || version.startsWith("workspace:")) continue;
+				if (catalog[name]) {
+					depMap[name] = "catalog:";
+				} else {
+					newEntries[name] = version;
+					depMap[name] = "catalog:";
+				}
+			}
+		};
+
+		processMap(deps);
+		processMap(devDeps);
+
+		if (Object.keys(newEntries).length === 0) return;
+
+		for (const [name, version] of Object.entries(newEntries)) {
+			doc.setIn(["catalog", name], version);
+		}
+
+		await fs.writeFile(workspacePath, doc.toString());
+		logger.info("Added to pnpm-workspace.yaml catalog:");
+		for (const [name, version] of Object.entries(newEntries)) {
+			logger.info(`  + ${name}: ${version}`);
+		}
+	}
+
 	private static async writeJson(file: string, content: object) {
 		await fs.writeFile(file, `${JSON.stringify(content, null, 2)}\n`);
 	}

package/apps/startx-cli/src/configs/files.ts

@@ -16,6 +16,9 @@ export const FileCheck: WHITELIST_FILES = {
 	".prettierignore": {
 		tags: ["biome"],
 	},
+	"README.md": {
+		tags: ["never"],
+	},
 	"biome.json": {
 		tags: ["biome"],
 	},

package/apps/startx-cli/src/index.ts

@@ -3,6 +3,7 @@ import { logger } from "@repo/logger";
 import { Command } from "commander";
 
 import { InitCommand } from "./commands/init";
+import { PackageCommand } from "./commands/package";
 import { version } from "../../../package.json";
 
 const program = new Command();
@@ -14,6 +15,6 @@ program.command("ping").action(() => {
 });
 
 program.addCommand(InitCommand.command);
-// program.addCommand(PackageCommand.command);
+program.addCommand(PackageCommand.command);
 
 program.parse(process.argv);

package/apps/web-client/package.json

@@ -23,7 +23,7 @@
 		"react": "catalog:",
 		"react-dom": "catalog:",
 		"react-router": "catalog:",
-		"zustand": "^5.0.13",
+		"zustand": "catalog:",
 		"@repo/common": "workspace:*"
 	},
 	"devDependencies": {

package/configs/eslint-config/package.json

@@ -20,29 +20,29 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"@eslint/compat": "^2.0.2",
-		"@eslint/js": "^9.0.0",
-		"@stylistic/eslint-plugin": "^2.0.0",
-		"eslint-config-prettier": "^9.1.0",
-		"eslint-import-resolver-typescript": "^3.6.1",
-		"eslint-plugin-import-x": "^4.0.0",
-		"eslint-plugin-jsx-a11y": "^6.9.0",
-		"eslint-plugin-lodash": "^8.0.0",
-		"eslint-plugin-react": "^7.35.0",
-		"eslint-plugin-react-hooks": "^5.0.0",
-		"eslint-plugin-unicorn": "^55.0.0",
-		"eslint-plugin-unused-imports": "^4.0.0",
-		"globals": "^15.9.0"
+		"@eslint/compat": "catalog:",
+		"@eslint/js": "catalog:",
+		"@stylistic/eslint-plugin": "catalog:",
+		"eslint-config-prettier": "catalog:",
+		"eslint-import-resolver-typescript": "catalog:",
+		"eslint-plugin-import-x": "catalog:",
+		"eslint-plugin-jsx-a11y": "catalog:",
+		"eslint-plugin-lodash": "catalog:",
+		"eslint-plugin-react": "catalog:",
+		"eslint-plugin-react-hooks": "catalog:",
+		"eslint-plugin-unicorn": "catalog:",
+		"eslint-plugin-unused-imports": "catalog:",
+		"globals": "catalog:"
 	},
 	"devDependencies": {
-		"typescript-eslint": "^8.54.0",
-		"@types/eslint-config-prettier": "^6.11.3",
-		"@types/eslint-plugin-jsx-a11y": "^6.10.1",
-		"@typescript-eslint/eslint-plugin": "^8.0.0",
-		"@typescript-eslint/rule-tester": "^8.54.0",
-		"@typescript-eslint/utils": "^8.0.0",
+		"@types/eslint-config-prettier": "catalog:",
+		"@types/eslint-plugin-jsx-a11y": "catalog:",
+		"@typescript-eslint/eslint-plugin": "catalog:",
+		"@typescript-eslint/rule-tester": "catalog:",
+		"@typescript-eslint/utils": "catalog:",
 		"eslint": "catalog:",
 		"typescript-config": "workspace:*",
+		"typescript-eslint": "catalog:",
 		"vitest-config": "workspace:*"
 	},
 	"startx": {

package/configs/vitest-config/package.json

@@ -3,7 +3,7 @@
 	"version": "1.5.0",
 	"type": "module",
 	"devDependencies": {
-		"jsdom": "^29.0.1",
+		"jsdom": "catalog:",
 		"typescript-config": "workspace:*",
 		"vite": "catalog:",
 		"vitest": "catalog:"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "startx",
   "description": "",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/avinashid/startx.git"

package/packages/@repo/lib/package.json

@@ -18,8 +18,8 @@
 		"./*": "./src/*/index.ts"
 	},
 	"devDependencies": {
-		"@types/jsonwebtoken": "^9.0.7",
-		"@types/nodemailer": "^6.4.16",
+		"@types/jsonwebtoken": "catalog:",
+		"@types/nodemailer": "catalog:",
 		"eslint-config": "workspace:*",
 		"typescript-config": "workspace:*",
 		"vine": "link:@types/vinejs/vine",
@@ -38,7 +38,7 @@
 		"firebase-admin": "catalog:",
 		"jsonwebtoken": "catalog:",
 		"nodemailer": "catalog:",
-		"yaml": "^2.8.2"
+		"yaml": "catalog:"
 	},
 	"startx": {
 		"iTags": [

package/packages/aix/package.json

@@ -21,14 +21,14 @@
 		"vitest-config": "workspace:*"
 	},
 	"dependencies": {
-		"@aws-sdk/client-bedrock": "^3.1047.0",
-		"@aws-sdk/client-bedrock-runtime": "^3.1047.0",
+		"@aws-sdk/client-bedrock": "catalog:",
+		"@aws-sdk/client-bedrock-runtime": "catalog:",
 		"@repo/env": "workspace:*",
 		"@repo/lib": "workspace:*",
 		"@repo/logger": "workspace:*",
-		"@toon-format/toon": "^2.1.0",
+		"@toon-format/toon": "catalog:",
 		"js-tiktoken": "catalog:",
-		"jsonrepair": "^3.14.0",
+		"jsonrepair": "catalog:",
 		"openai": "catalog:",
 		"pg": "catalog:",
 		"quickjs-emscripten": "catalog:",

package/packages/ui/package.json

@@ -19,34 +19,34 @@
 		"@tailwindcss/vite": "catalog:",
 		"@types/react": "catalog:",
 		"@types/react-dom": "catalog:",
-		"autoprefixer": "^10",
+		"autoprefixer": "catalog:",
 		"eslint-config": "workspace:*",
 		"tailwindcss": "catalog:",
 		"typescript-config": "workspace:*",
 		"vitest-config": "workspace:*"
 	},
 	"dependencies": {
-		"@fontsource-variable/eb-garamond": "^5.2.7",
-		"@fontsource-variable/inter": "^5.2.8",
-		"@hookform/resolvers": "^3.9.1",
-		"@phosphor-icons/react": "^2.1.10",
-		"@tailwindcss/postcss": "^4",
-		"@tailwindcss/typography": "^0.5.19",
+		"@fontsource-variable/eb-garamond": "catalog:",
+		"@fontsource-variable/inter": "catalog:",
+		"@hookform/resolvers": "catalog:",
+		"@phosphor-icons/react": "catalog:",
+		"@tailwindcss/postcss": "catalog:",
+		"@tailwindcss/typography": "catalog:",
 		"@tanstack/react-query": "catalog:",
 		"@tanstack/react-query-devtools": "catalog:",
-		"class-variance-authority": "^0.7.1",
-		"clsx": "^2.1.1",
-		"cmdk": "^1.1.1",
-		"embla-carousel-react": "^8.6.0",
-		"input-otp": "^1.4.2",
+		"class-variance-authority": "catalog:",
+		"clsx": "catalog:",
+		"cmdk": "catalog:",
+		"embla-carousel-react": "catalog:",
+		"input-otp": "catalog:",
 		"lucide-react": "catalog:",
-		"next-themes": "^0.4.6",
-		"radix-ui": "^1.4.3",
-		"react-hook-form": "^7.75.0",
-		"react-icons": "^5.5.0",
-		"sonner": "^2.0.7",
-		"tailwind-merge": "^2.3.0",
-		"tw-animate-css": "^1.4.0"
+		"next-themes": "catalog:",
+		"radix-ui": "catalog:",
+		"react-hook-form": "catalog:",
+		"react-icons": "catalog:",
+		"sonner": "catalog:",
+		"tailwind-merge": "catalog:",
+		"tw-animate-css": "catalog:"
 	},
 	"exports": {
 		"./globals.css": "./src/styles/globals.css",