create-projx 1.5.4 → 1.5.5

package/dist/index.js

@@ -501,6 +501,33 @@ function generateVscodeSettings(vars) {
 
 // src/baseline.ts
 var BASELINE_REF = "refs/projx/baseline";
+async function writeManagedProjx(cwd, version, vars, components) {
+  const projxPath = join3(cwd, ".projx");
+  let existing = {};
+  if (existsSync2(projxPath)) {
+    try {
+      existing = JSON.parse(await readFile3(projxPath, "utf-8"));
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.warn(`projx: existing .projx is unreadable (${msg}); writing fresh.`);
+    }
+  }
+  const merged = {
+    ...existing,
+    version
+  };
+  if (components !== void 0) {
+    merged.components = components;
+  }
+  if (typeof merged.createdAt !== "string") {
+    merged.createdAt = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+  }
+  const pmObj = vars.pm;
+  if (pmObj?.name && !merged.packageManager) {
+    merged.packageManager = pmObj.name;
+  }
+  await writeFile2(projxPath, JSON.stringify(merged, null, 2) + "\n");
+}
 function matchesSkip(filePath, patterns) {
   for (const pattern of patterns) {
     if (pattern === "**") return true;
@@ -558,7 +585,10 @@ function mergeFileThreeWay(oursPath, baseContent, theirsContent) {
   try {
     writeFileSync(baseTmp, baseContent);
     writeFileSync(theirsTmp, theirsContent);
-    execSync2(`git merge-file "${oursPath}" "${baseTmp}" "${theirsTmp}"`, { stdio: "pipe" });
+    execSync2(
+      `git merge-file -L "your changes" -L "previous projx baseline" -L "new projx template" "${oursPath}" "${baseTmp}" "${theirsTmp}"`,
+      { stdio: "pipe" }
+    );
     return true;
   } catch {
     return false;
@@ -595,6 +625,7 @@ async function tryThreeWayMerge(cwd, templateDir, baselineRef) {
   const merged = [];
   const conflicted = [];
   for (const file of templateFiles) {
+    if (file === ".projx") continue;
     const oursPath = join3(cwd, file);
     if (!existsSync2(oursPath)) continue;
     const baseContent = getFileAtRef(cwd, baselineRef, file);
@@ -606,8 +637,13 @@ async function tryThreeWayMerge(cwd, templateDir, baselineRef) {
       continue;
     }
     const oursContent = await readFile3(oursPath, "utf-8");
-    if (oursContent === baseContent) continue;
     if (theirsContent === baseContent) continue;
+    if (oursContent === baseContent) {
+      await writeFile2(oursPath, theirsContent);
+      merged.push(file);
+      continue;
+    }
+    if (oursContent === theirsContent) continue;
     const clean = mergeFileThreeWay(oursPath, baseContent, theirsContent);
     if (clean) {
       merged.push(file);
@@ -714,14 +750,7 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
     await mkdir2(join3(dest, ".vscode"), { recursive: true });
     await writeFile2(join3(dest, ".vscode/settings.json"), generateVscodeSettings(vars));
   }
-  const projxConfig = {
-    version,
-    components,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
-  };
-  const pmObj = vars.pm;
-  if (pmObj?.name) projxConfig.packageManager = pmObj.name;
-  await writeFile2(join3(dest, ".projx"), JSON.stringify(projxConfig, null, 2) + "\n");
+  await writeManagedProjx(dest, version, vars, components);
 }
 async function substituteNames(dest, components, paths, name, nameSnake) {
   if (components.includes("fastapi")) {
@@ -804,15 +833,8 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
       await writeTemplateToDir(tmpTemplate, repoDir, components, componentPaths, vars, version, origin, componentSkips, rootSkip);
       const result = await tryThreeWayMerge(cwd, tmpTemplate, baselineRef);
       await rm2(tmpTemplate, { recursive: true, force: true });
-      const projxConfig = {
-        version,
-        components,
-        createdAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
-      };
-      const pmObj = vars.pm;
-      if (pmObj?.name) projxConfig.packageManager = pmObj.name;
-      await writeFile2(join3(cwd, ".projx"), JSON.stringify(projxConfig, null, 2) + "\n");
       if (result.conflicted.length === 0) {
+        await writeManagedProjx(cwd, version, vars);
         execSync2("git add -A", { cwd, stdio: "pipe" });
         const staged = execSync2("git diff --cached --stat", { cwd, stdio: "pipe" }).toString().trim();
         if (staged) {
@@ -824,12 +846,7 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
         saveBaselineRef(cwd);
         return result.merged.length > 0 ? { status: "merged", mergedFiles: result.merged } : { status: "clean" };
       }
-      for (const f of result.conflicted) {
-        try {
-          execSync2(`git checkout -- "${f}"`, { cwd, stdio: "pipe" });
-        } catch {
-        }
-      }
+      await writeManagedProjx(cwd, version, vars);
       for (const f of result.merged) {
         try {
           execSync2(`git add "${f}"`, { cwd, stdio: "pipe" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-projx",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Scaffold production-grade fullstack projects in seconds. FastAPI, Fastify, React, Flutter, Terraform — with auth, database, CI/CD, E2E tests, and Docker. One command, ready to deploy.",
   "type": "module",
   "bin": {