create-flow-os 0.0.62-dev.1772063592 → 0.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.62-dev.1772063592",
+  "version": "0.0.62",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {

package/src/init/scaffold.ts

@@ -63,13 +63,13 @@ async function writeMergedWithUser(
   }
 }
 
-/** Indica se create-flow-os è in modalità dev (flow-os@dev) */
+/** Indica se create-flow-os è in modalità dev (flow-os@dev). Usa la versione del pkg create-flow-os: se pre-release (-dev) → dev mode. */
 function isCreateFlowOsDev(): boolean {
   try {
     const cliRoot = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
-    const pkg = JSON.parse(readFileSync(join(cliRoot, "package.json"), "utf-8")) as { dependencies?: Record<string, string> };
-    const v = pkg.dependencies?.["@flow-os/client"];
-    return !!v?.includes("dev");
+    const pkg = JSON.parse(readFileSync(join(cliRoot, "package.json"), "utf-8")) as { version?: string };
+    const v = pkg.version ?? "";
+    return v.includes("-dev");
   } catch {
     return false;
   }
@@ -183,18 +183,20 @@ function resolveFlowDeps(
     const v = resolved[k];
     if (v !== "workspace:*" && v !== "0.0.1" && !versionsFromNpm.has(k)) continue;
     let spec: string | undefined;
-    const npmVer = versionsFromNpm.get(k);
-    if (npmVer) {
-      spec = isDevSpec && k === "@flow-os/client" ? "dev" : `^${npmVer}`;
-    } else if (k === "@flow-os/client" && isDevSpec) {
+    if (isDevSpec) {
       spec = "dev";
     } else {
-      try {
-        const root = pkgRoot(k);
-        const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf-8")) as { version?: string };
-        if (pkg.version) spec = `^${pkg.version}`;
-      } catch {}
-      if (!spec && ownerVersion) spec = `^${ownerVersion}`;
+      const npmVer = versionsFromNpm.get(k);
+      if (npmVer) {
+        spec = `^${npmVer}`;
+      } else {
+        try {
+          const root = pkgRoot(k);
+          const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf-8")) as { version?: string };
+          if (pkg.version) spec = `^${pkg.version}`;
+        } catch {}
+        if (!spec && ownerVersion) spec = `^${ownerVersion}`;
+      }
     }
     if (spec) resolved[k] = spec;
   }
@@ -295,7 +297,13 @@ function addDependencyForPackage(
   if (!existsSync(targetPath)) return;
   const target = JSON.parse(readFileSync(targetPath, "utf-8"));
   target.dependencies = target.dependencies ?? {};
-  const spec = useWorkspace ? "workspace:*" : (versionsFromNpm.get(pkgName) ? `^${versionsFromNpm.get(pkgName)}` : undefined);
+  const spec = useWorkspace
+    ? "workspace:*"
+    : pkgName.startsWith("@flow-os/") && isCreateFlowOsDev()
+      ? "dev"
+      : versionsFromNpm.get(pkgName)
+        ? `^${versionsFromNpm.get(pkgName)}`
+        : undefined;
   if (spec) target.dependencies[pkgName] = spec;
   writeFileSync(targetPath, JSON.stringify(sortPkgKeys(target), null, 2));
 }
@@ -324,7 +332,7 @@ function flowDepsFromPkg(pkgPath: string): string[] {
 /** Fase 1: raccoglie e merge tutti i template in memoria, ritorna ordine pacchetti */
 async function collectAllTemplates(
   libs: string[],
-  combined: Map<string, string>,
+  combined: Map<string, TemplateEntry>,
   done: Set<string>,
   order: string[],
   versionsFromNpm: Map<string, string>,