fix: create-dojo update catalog versions

Author: MartianGreed

packages/create-dojo/package.json

@@ -27,7 +27,9 @@
         "cross-spawn": "^7.0.3",
         "fs-extra": "^11.2.0",
         "prompts": "^2.4.2",
-        "type-fest": "^4.26.1"
+        "type-fest": "^4.26.1",
+        "js-yaml": "^4.1.0",
+        "node-fetch": "^2.6.9"
     },
     "devDependencies": {
         "@types/cross-spawn": "^6.0.6",

packages/create-dojo/src/commands/start.ts

@@ -4,6 +4,7 @@ import { promises as fs } from "fs";
 import spawn from "cross-spawn";
 import https from "https";
 import { input, select } from "@inquirer/prompts";
+import { getCatalogVersions } from "../utils/get-package-info";
 
 const templates = [
     {
@@ -96,19 +97,59 @@ async function rewritePackageJson(projectName: string, clientPath: string) {
     const packageJsonPath = path.join(clientPath, "package.json");
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, "utf-8"));
     const latestVersion = await getLatestVersion();
+    const catalogVersion = await getCatalogVersions();
 
     packageJson.name = projectName;
 
-    for (let dep of Object.keys(packageJson.dependencies)) {
-        if (
-            dep.startsWith("@dojoengine") &&
-            packageJson.dependencies[dep].startsWith("workspace:")
-        ) {
-            packageJson.dependencies[dep] = latestVersion;
+    const updatedPackageJson = {
+        ...packageJson,
+        dependencies: updateDependencies(
+            packageJson.dependencies,
+            latestVersion,
+            catalogVersion
+        ),
+        devDependencies: updateDependencies(
+            packageJson.devDependencies,
+            latestVersion,
+            catalogVersion
+        ),
+        peerDependencies: updateDependencies(
+            packageJson.peerDependencies,
+            latestVersion,
+            catalogVersion
+        ),
+    };
+
+    await fs.writeFile(
+        packageJsonPath,
+        JSON.stringify(updatedPackageJson, null, 2)
+    );
+}
+
+function updateDependencies(
+    deps: Record<string, string> | undefined,
+    latestVersion: string,
+    catalogVersions: Record<string, string>
+) {
+    if (!deps) return deps;
+
+    const updated = { ...deps };
+    for (const [name, version] of Object.entries(deps)) {
+        if (version.startsWith("workspace:")) {
+            // Find the actual version from root package.json
+            updated[name] = latestVersion;
+        } else if (version.startsWith("catalog:")) {
+            // Find the version from catalog
+            const actualVersion = catalogVersions[name];
+            if (!actualVersion) {
+                throw new Error(
+                    `failed to get version for package ${name} from catalog`
+                );
+            }
+            updated[name] = actualVersion;
         }
     }
-
-    await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    return updated;
 }
 
 async function rewriteDojoConfigFile(clientPath: string) {

packages/create-dojo/src/index.ts

@@ -3,7 +3,7 @@ import { start } from "./commands/start";
 
 import { Command } from "commander";
 
-import { getPackageInfo } from "./utils/get-package-info";
+import { getCatalogVersions, getPackageInfo } from "./utils/get-package-info";
 
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));

packages/create-dojo/src/utils/get-package-info.ts

@@ -1,6 +1,29 @@
 import path from "path";
 import fs from "fs-extra";
 import { type PackageJson } from "type-fest";
+import yaml from "js-yaml";
+import fetch from "node-fetch";
+
+interface WorkspaceYaml {
+    catalog: Record<string, string>;
+}
+
+export async function getCatalogVersions(): Promise<Record<string, string>> {
+    const WORKSPACE_YAML_URL =
+        "https://raw.githubusercontent.com/dojoengine/dojo.js/refs/heads/main/pnpm-workspace.yaml";
+
+    try {
+        // Fetch workspace yaml to get package paths
+        const yamlResponse = await fetch(WORKSPACE_YAML_URL);
+        const yamlContent = await yamlResponse.text();
+        const workspaceConfig = yaml.load(yamlContent) as WorkspaceYaml;
+
+        return workspaceConfig.catalog;
+    } catch (error) {
+        console.warn("Failed to fetch catalog versions:", error);
+        return {};
+    }
+}
 
 export function getPackageInfo() {
     const packageJsonPath = path.join(process.cwd(), "package.json");