set starter plugin and project versions

Author: lalalune

packages/cli/src/scripts/copy-templates.ts

@@ -15,6 +15,31 @@ const __dirname = path.dirname(__filename);
 // Define paths
 const ROOT_DIR = path.resolve(__dirname, "../../../..");
 const CLI_DIST_DIR = path.resolve(ROOT_DIR, "packages/cli/dist");
+const TEMPLATES_DIR = path.resolve(ROOT_DIR, "packages/cli/templates");
+
+/**
+ * Updates package.json with the CLI version and replaces workspace references
+ */
+async function updatePackageJson(packagePath, cliVersion) {
+	const packageJsonContent = await fs.readFile(packagePath, "utf-8");
+	const packageData = JSON.parse(packageJsonContent);
+	
+	// Update version
+	packageData.version = cliVersion;
+	
+	// Replace workspace references in dependencies
+	for (const section of ["dependencies", "devDependencies"]) {
+		if (packageData[section]) {
+			for (const [dep, version] of Object.entries(packageData[section])) {
+				if (version === "workspace:*") {
+					packageData[section][dep] = cliVersion;
+				}
+			}
+		}
+	}
+	
+	await fs.writeFile(packagePath, JSON.stringify(packageData, null, 2));
+}
 
 async function main() {
 	try {
@@ -25,50 +50,47 @@ async function main() {
 			process.exit(1);
 		}
 
-		// if templates directory doesn't exist, create it
-		const TEMPLATES_DIR = path.resolve(ROOT_DIR, "packages/cli/templates");
+		// Prepare templates directory
 		if (!fs.existsSync(TEMPLATES_DIR)) {
 			await fs.ensureDir(TEMPLATES_DIR);
 		} else {
 			// Clean existing templates to prevent conflicts
 			await fs.emptyDir(TEMPLATES_DIR);
 		}
 
-		// Define source and destination paths with absolute paths
-		const projectStarterSrc = path.resolve(ROOT_DIR, "packages/project-starter");
-		const projectStarterDest = path.resolve(TEMPLATES_DIR, "project-starter");
-		
-		const pluginStarterSrc = path.resolve(ROOT_DIR, "packages/plugin-starter");
-		const pluginStarterDest = path.resolve(TEMPLATES_DIR, "plugin-starter");
-
-		// Copy project-starter and plugin-starter from packages to packages/cli/templates
-		console.log(`Copying from ${projectStarterSrc} to ${projectStarterDest}`);
-		await fs.copy(projectStarterSrc, projectStarterDest);
-		
-		console.log(`Copying from ${pluginStarterSrc} to ${pluginStarterDest}`);
-		await fs.copy(pluginStarterSrc, pluginStarterDest);
+		// Get CLI version from package.json
+		const cliPackageJsonPath = path.resolve(ROOT_DIR, "packages/cli/package.json");
+		const cliPackageData = JSON.parse(await fs.readFile(cliPackageJsonPath, "utf-8"));
+		const cliVersion = cliPackageData.version;
+		console.log("CLI version:", cliVersion);
 
-		// get the version of our CLI, from the package.json
-		const CLI_PACKAGE_JSON = path.resolve(ROOT_DIR, "packages/cli/package.json");
-		const CLI_PACKAGE_JSON_CONTENT = await fs.readFile(CLI_PACKAGE_JSON, "utf-8");
-		const CLI_PACKAGE_JSON_DATA = JSON.parse(CLI_PACKAGE_JSON_CONTENT);
-		const CLI_VERSION = CLI_PACKAGE_JSON_DATA.version;
+		// Define templates to copy
+		const templates = [
+			{
+				name: "project-starter",
+				src: path.resolve(ROOT_DIR, "packages/project-starter"),
+				dest: path.resolve(TEMPLATES_DIR, "project-starter")
+			},
+			{
+				name: "plugin-starter",
+				src: path.resolve(ROOT_DIR, "packages/plugin-starter"),
+				dest: path.resolve(TEMPLATES_DIR, "plugin-starter")
+			}
+		];
 
-		console.log("CLI version:", CLI_VERSION);
-		
-		const replacedStarter = await fs.readFile(path.resolve(projectStarterDest, "package.json"), "utf-8");
-		const replacedStarterData = JSON.parse(replacedStarter);
-		replacedStarterData.version = CLI_VERSION;
-		await fs.writeFile(path.resolve(projectStarterDest, "package.json"), JSON.stringify(replacedStarterData, null, 2));
-
-		const replacedPlugin = await fs.readFile(path.resolve(pluginStarterDest, "package.json"), "utf-8");
-		const replacedPluginData = JSON.parse(replacedPlugin);
-		replacedPluginData.version = CLI_VERSION;
-		await fs.writeFile(path.resolve(pluginStarterDest, "package.json"), JSON.stringify(replacedPluginData, null, 2));
+		// Copy each template and update its package.json
+		for (const template of templates) {
+			console.log(`Copying from ${template.src} to ${template.dest}`);
+			await fs.copy(template.src, template.dest);
+			
+			// Update package.json with correct version
+			const packageJsonPath = path.resolve(template.dest, "package.json");
+			await updatePackageJson(packageJsonPath, cliVersion);
+		}
 
 		console.log("Templates successfully copied to packages/cli/templates.");
 	} catch (error) {
-		console.error("Error copying templates:", error);	
+		console.error("Error copying templates:", error);
 		process.exit(1);
 	}
 }

packages/cli/src/utils/copy-template.ts

@@ -155,8 +155,6 @@ export async function copyClientDist() {
 	const srcClientDist = path.resolve(process.cwd(), "../client/dist");
 	const destClientDist = path.resolve(process.cwd(), "./dist");
 
-	console.log("*** srcClientDist", srcClientDist);
-
 	// Create destination directory
 	await fs.mkdir(destClientDist, { recursive: true });
 
@@ -166,7 +164,6 @@ export async function copyClientDist() {
 	const retryDelay = 1000; // 1 second
 
 	while (retries < maxRetries) {
-		console.log("*** srcClientDist", srcClientDist);
 		if (existsSync(srcClientDist)) {
 			const files = await fs.readdir(srcClientDist);
 			if (files.length > 0) {
@@ -177,7 +174,6 @@ export async function copyClientDist() {
 		logger.info(
 			`Waiting for client dist files to be built (attempt ${retries + 1}/${maxRetries})...`,
 		);
-		console.log("*** waiting for client dist files to be built");
 		await new Promise((resolve) => setTimeout(resolve, retryDelay));
 		retries++;
 	}