create-projx 1.1.0 → 1.1.2

package/dist/index.js

@@ -122,7 +122,7 @@ async function copyComponent(repoDir, component, dest) {
 async function copyStaticFiles(repoDir, dest) {
   const manifest = [];
   const tpl = repoDir;
-  const statics = [".editorconfig", "LICENSE"];
+  const statics = [".editorconfig"];
   for (const file of statics) {
     const src = join(tpl, file);
     if (existsSync(src)) {
@@ -135,10 +135,11 @@ async function copyStaticFiles(repoDir, dest) {
     await cp(gitignore, join(dest, ".gitignore"));
     manifest.push(".gitignore");
   }
-  const vscode = join(tpl, ".vscode");
-  if (existsSync(vscode)) {
-    await cp(vscode, join(dest, ".vscode"), { recursive: true });
-    manifest.push(".vscode/settings.json", ".vscode/extensions.json");
+  const extensionsJson = join(tpl, ".vscode/extensions.json");
+  if (existsSync(extensionsJson)) {
+    await mkdir(join(dest, ".vscode"), { recursive: true });
+    await cp(extensionsJson, join(dest, ".vscode/extensions.json"));
+    manifest.push(".vscode/extensions.json");
   }
   const scripts = join(tpl, "scripts");
   if (existsSync(scripts)) {
@@ -185,9 +186,24 @@ async function readFileOrNull(path) {
   }
 }
 async function writeComponentMarker(dir, component) {
+  const markerPath = join(dir, COMPONENT_MARKER);
+  let components = [component];
+  const existing = await readFileOrNull(markerPath);
+  if (existing) {
+    try {
+      const data = JSON.parse(existing);
+      const prev = data.components ?? (data.component ? [data.component] : []);
+      if (!prev.includes(component)) {
+        components = [...prev, component];
+      } else {
+        return;
+      }
+    } catch {
+    }
+  }
   await writeFile(
-    join(dir, COMPONENT_MARKER),
-    JSON.stringify({ component }, null, 2) + "\n"
+    markerPath,
+    JSON.stringify({ components }, null, 2) + "\n"
   );
 }
 async function discoverComponentPaths(cwd, components) {
@@ -203,8 +219,11 @@ async function discoverComponentPaths(cwd, components) {
       if (existsSync(marker)) {
         try {
           const data = JSON.parse(await readFile(marker, "utf-8"));
-          if (components.includes(data.component)) {
-            paths[data.component] = entry.name;
+          const markerComponents = data.components ?? (data.component ? [data.component] : []);
+          for (const mc of markerComponents) {
+            if (components.includes(mc)) {
+              paths[mc] = entry.name;
+            }
           }
         } catch {
         }
@@ -331,6 +350,36 @@ async function generateCiYml(vars) {
 async function generateReadme(vars) {
   return renderShared("README.md.ejs", vars);
 }
+function generateVscodeSettings(vars) {
+  const settings = {};
+  if (vars.components.includes("fastapi")) {
+    settings["[python]"] = {
+      "editor.defaultFormatter": "charliermarsh.ruff",
+      "editor.codeActionsOnSave": { "source.fixAll.ruff": "explicit" }
+    };
+  }
+  settings["[typescript]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["[typescriptreact]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["[javascript]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["[json]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["[css]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["[yaml]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["editor.formatOnSave"] = true;
+  settings["editor.codeActionsOnSave"] = { "source.fixAll.eslint": "explicit" };
+  settings["eslint.useFlatConfig"] = true;
+  const prettierComponent = ["frontend", "fastify", "e2e"].find(
+    (c) => vars.components.includes(c)
+  );
+  if (prettierComponent) {
+    settings["prettier.configPath"] = `${vars.paths[prettierComponent]}/.prettierrc`;
+  }
+  if (vars.components.includes("fastapi")) {
+    settings["ruff.lineLength"] = 120;
+    settings["python.analysis.extraPaths"] = [`${vars.paths.fastapi}/src`];
+    settings["python.analysis.importFormat"] = "absolute";
+  }
+  return JSON.stringify(settings, null, 2) + "\n";
+}
 
 // src/scaffold.ts
 async function scaffold(opts, dest, localRepo) {
@@ -380,6 +429,8 @@ async function doScaffold(opts, dest, repoDir, name, nameSnake, vars) {
   await writeFile2(join3(dest, "setup.sh"), await generateSetupSh(vars));
   await chmod(join3(dest, "setup.sh"), 493);
   await copyStaticFiles(repoDir, dest);
+  await mkdir2(join3(dest, ".vscode"), { recursive: true });
+  await writeFile2(join3(dest, ".vscode/settings.json"), generateVscodeSettings(vars));
   const pkg = JSON.parse(
     await readFile3(join3(repoDir, "cli/package.json"), "utf-8")
   );
@@ -541,6 +592,10 @@ var NEVER_OVERWRITE = [
   /src\/migrations\/versions\//,
   /\.projx-component$/
 ];
+var MERGE_DEPS = [
+  /^[^/]+\/package\.json$/,
+  /^[^/]+\/pyproject\.toml$/
+];
 function isGitRepo(cwd) {
   try {
     execSync2("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });
@@ -629,13 +684,16 @@ async function update(cwd, localRepo) {
     }
     execSync2(`git checkout -b ${branchName}`, { cwd, stdio: "pipe" });
     p3.log.info(`Created branch: ${branchName}`);
+    let touchedFiles;
     try {
-      await doUpdate(cwd, config, repoDir, pkg.version, componentPaths);
+      touchedFiles = await doUpdate(cwd, config, repoDir, pkg.version, componentPaths);
     } finally {
       await cleanupRepo(repoDir, isLocal);
     }
-    execSync2("git add -A", { cwd, stdio: "pipe" });
-    execSync2(`git commit -m "projx update to v${pkg.version}"`, { cwd, stdio: "pipe" });
+    for (const f of touchedFiles) {
+      execSync2(`git add "${f}"`, { cwd, stdio: "pipe" });
+    }
+    execSync2(`git commit --no-verify -m "projx update to v${pkg.version}"`, { cwd, stdio: "pipe" });
     p3.outro(
       `Updated on branch: ${branchName}
 
@@ -669,8 +727,15 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
   const name = detectProjectName(cwd, config.components, componentPaths);
   const nameSnake = toSnake(name);
   const vars = { projectName: name, components: config.components, paths: componentPaths };
+  const touchedFiles = [];
+  const usedPaths = /* @__PURE__ */ new Set();
   for (const component of config.components) {
     const targetDir = componentPaths[component];
+    if (usedPaths.has(targetDir)) {
+      p3.log.warn(`${component} shares directory ${targetDir}/ with another component \u2014 skipping overlay to avoid nesting.`);
+      continue;
+    }
+    usedPaths.add(targetDir);
     const spinner6 = p3.spinner();
     spinner6.start(`Updating ${targetDir}/ (${component})`);
     const componentSrc = join4(repoDir, component);
@@ -687,11 +752,21 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
       if (NEVER_OVERWRITE.some((re) => re.test(destRel))) continue;
       const dir = dest.substring(0, dest.lastIndexOf("/"));
       await mkdir3(dir, { recursive: true });
-      await cp2(src, dest, { force: true });
+      if (MERGE_DEPS.some((re) => re.test(destRel)) && existsSync3(dest)) {
+        const merged = await mergeDeps(dest, src);
+        if (merged) {
+          await writeFile3(dest, merged);
+          touchedFiles.push(destRel);
+        }
+      } else {
+        await cp2(src, dest, { force: true });
+        touchedFiles.push(destRel);
+      }
     }
     await rm2(tmpDest, { recursive: true, force: true });
     if (!existsSync3(join4(cwd, targetDir, ".projx-component"))) {
       await writeComponentMarker(join4(cwd, targetDir), component);
+      touchedFiles.push(`${targetDir}/.projx-component`);
     }
     spinner6.stop(`${targetDir}/ updated.`);
   }
@@ -699,27 +774,24 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
   spinner5.start("Updating shared files");
   const hasBackend = config.components.includes("fastapi") || config.components.includes("fastify");
   if (hasBackend || config.components.includes("frontend")) {
-    await writeFile3(
-      join4(cwd, "docker-compose.yml"),
-      await generateDockerCompose(vars)
-    );
-    await writeFile3(
-      join4(cwd, "docker-compose.dev.yml"),
-      await generateDockerComposeDev(vars)
-    );
+    await writeFile3(join4(cwd, "docker-compose.yml"), await generateDockerCompose(vars));
+    touchedFiles.push("docker-compose.yml");
+    await writeFile3(join4(cwd, "docker-compose.dev.yml"), await generateDockerComposeDev(vars));
+    touchedFiles.push("docker-compose.dev.yml");
   }
   await mkdir3(join4(cwd, ".githooks"), { recursive: true });
-  const preCommit = await generatePreCommit(vars);
-  await writeFile3(join4(cwd, ".githooks/pre-commit"), preCommit);
+  await writeFile3(join4(cwd, ".githooks/pre-commit"), await generatePreCommit(vars));
   await chmod2(join4(cwd, ".githooks/pre-commit"), 493);
+  touchedFiles.push(".githooks/pre-commit");
   await mkdir3(join4(cwd, ".github/workflows"), { recursive: true });
-  await writeFile3(
-    join4(cwd, ".github/workflows/ci.yml"),
-    await generateCiYml(vars)
-  );
-  const setupSh = await generateSetupSh(vars);
-  await writeFile3(join4(cwd, "setup.sh"), setupSh);
+  await writeFile3(join4(cwd, ".github/workflows/ci.yml"), await generateCiYml(vars));
+  touchedFiles.push(".github/workflows/ci.yml");
+  await writeFile3(join4(cwd, "setup.sh"), await generateSetupSh(vars));
   await chmod2(join4(cwd, "setup.sh"), 493);
+  touchedFiles.push("setup.sh");
+  await mkdir3(join4(cwd, ".vscode"), { recursive: true });
+  await writeFile3(join4(cwd, ".vscode/settings.json"), generateVscodeSettings(vars));
+  touchedFiles.push(".vscode/settings.json");
   spinner5.stop("Shared files updated.");
   if (config.components.includes("mobile")) {
     const mobilePath = componentPaths.mobile ?? "mobile";
@@ -737,6 +809,8 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
     paths: componentPaths
   };
   await writeFile3(join4(cwd, ".projx"), JSON.stringify(updatedConfig, null, 2));
+  touchedFiles.push(".projx");
+  return touchedFiles;
 }
 function detectProjectName(cwd, components, componentPaths) {
   for (const component of components) {
@@ -757,6 +831,63 @@ function detectProjectName(cwd, components, componentPaths) {
   }
   return toKebab(cwd.split("/").pop());
 }
+async function mergeDeps(existingPath, templatePath) {
+  if (existingPath.endsWith("package.json")) {
+    return mergePackageJson(existingPath, templatePath);
+  }
+  if (existingPath.endsWith("pyproject.toml")) {
+    return mergePyprojectToml(existingPath, templatePath);
+  }
+  return null;
+}
+async function mergePackageJson(existingPath, templatePath) {
+  const existingRaw = await readFileOrNull(existingPath);
+  const templateRaw = await readFileOrNull(templatePath);
+  if (!existingRaw || !templateRaw) return null;
+  try {
+    const existing = JSON.parse(existingRaw);
+    const template = JSON.parse(templateRaw);
+    if (template.dependencies) {
+      existing.dependencies = { ...template.dependencies, ...existing.dependencies };
+    }
+    if (template.devDependencies) {
+      existing.devDependencies = { ...template.devDependencies, ...existing.devDependencies };
+    }
+    if (template.scripts) {
+      existing.scripts = { ...template.scripts, ...existing.scripts };
+    }
+    return JSON.stringify(existing, null, 2) + "\n";
+  } catch {
+    return null;
+  }
+}
+async function mergePyprojectToml(existingPath, templatePath) {
+  const existingRaw = await readFileOrNull(existingPath);
+  const templateRaw = await readFileOrNull(templatePath);
+  if (!existingRaw || !templateRaw) return null;
+  const templateDeps = extractTomlDeps(templateRaw);
+  if (templateDeps.length === 0) return null;
+  const existingDeps = extractTomlDeps(existingRaw);
+  const existingNames = new Set(existingDeps.map((d) => d.replace(/[><=!~[].*/, "").trim().toLowerCase()));
+  const newDeps = templateDeps.filter((d) => {
+    const name = d.replace(/[><=!~[].*/, "").trim().toLowerCase();
+    return !existingNames.has(name);
+  });
+  if (newDeps.length === 0) return null;
+  const depsMatch = existingRaw.match(/^dependencies\s*=\s*\[([^\]]*)\]/m);
+  if (!depsMatch) return null;
+  const closingBracket = existingRaw.indexOf("]", depsMatch.index);
+  const before = existingRaw.slice(0, closingBracket);
+  const after = existingRaw.slice(closingBracket);
+  const indent = "  ";
+  const newLines = newDeps.map((d) => `${indent}"${d}",`).join("\n");
+  return before.trimEnd() + "\n" + newLines + "\n" + after;
+}
+function extractTomlDeps(toml) {
+  const match = toml.match(/^dependencies\s*=\s*\[([\s\S]*?)\]/m);
+  if (!match) return [];
+  return match[1].split("\n").map((l) => l.trim()).filter((l) => l.startsWith('"') || l.startsWith("'")).map((l) => l.replace(/^["']|["'],?$/g, "").trim()).filter(Boolean);
+}
 
 // src/add.ts
 import { copyFileSync as copyFileSync2, existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
@@ -1279,7 +1410,7 @@ async function generateSharedFiles(cwd, repoDir, vars) {
       }
     }
   }
-  const statics = [".editorconfig", "LICENSE"];
+  const statics = [".editorconfig"];
   for (const file of statics) {
     const src = join7(repoDir, file);
     const dest = join7(cwd, file);
@@ -1303,16 +1434,29 @@ async function generateSharedFiles(cwd, repoDir, vars) {
       }
     }
   }
-  const vscode = join7(repoDir, ".vscode");
-  if (existsSync6(vscode)) {
-    const vscodeDest = join7(cwd, ".vscode");
-    if (!existsSync6(vscodeDest)) {
-      await cp3(vscode, vscodeDest, { recursive: true });
-      p5.log.success(".vscode/");
+  const vscodeDest = join7(cwd, ".vscode");
+  await mkdir5(vscodeDest, { recursive: true });
+  const settingsPath = join7(vscodeDest, "settings.json");
+  const settingsContent = generateVscodeSettings(vars);
+  const existingSettings = await readFileOrNull(settingsPath);
+  if (existingSettings === null) {
+    await writeFile5(settingsPath, settingsContent);
+    p5.log.success(".vscode/settings.json");
+  } else if (existingSettings !== settingsContent) {
+    const action = await resolveConflict(".vscode/settings.json", existingSettings, settingsContent);
+    if (action === "overwrite") {
+      await writeFile5(settingsPath, settingsContent);
+      p5.log.success(".vscode/settings.json \u2014 overwritten.");
     } else {
-      p5.log.info(".vscode/ \u2014 already exists, skipped.");
+      p5.log.info(".vscode/settings.json \u2014 kept existing.");
     }
   }
+  const extSrc = join7(repoDir, ".vscode/extensions.json");
+  const extDest = join7(vscodeDest, "extensions.json");
+  if (existsSync6(extSrc) && !existsSync6(extDest)) {
+    await cp3(extSrc, extDest);
+    p5.log.success(".vscode/extensions.json");
+  }
 }
 async function resolveConflict(filePath, existing, template) {
   let action = await p5.select({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-projx",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Scaffold production-grade projects. Pick your stack (FastAPI, Fastify, React, Flutter), get a fully wired template with auth, database, CI/CD, and E2E tests.",
   "type": "module",
   "bin": {

package/src/templates/ci.yml.ejs

@@ -7,9 +7,66 @@ on:
     branches: [main]
 
 jobs:
+  changes:
+    name: Detect changes
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    outputs:
+<% if (components.includes('fastapi')) { %>
+      fastapi: ${{ steps.filter.outputs.<%= paths.fastapi %> }}
+<% } %>
+<% if (components.includes('fastify')) { %>
+      fastify: ${{ steps.filter.outputs.<%= paths.fastify %> }}
+<% } %>
+<% if (components.includes('frontend')) { %>
+      frontend: ${{ steps.filter.outputs.<%= paths.frontend %> }}
+<% } %>
+<% if (components.includes('mobile')) { %>
+      mobile: ${{ steps.filter.outputs.<%= paths.mobile %> }}
+<% } %>
+<% if (components.includes('e2e')) { %>
+      e2e: ${{ steps.filter.outputs.<%= paths.e2e %> }}
+<% } %>
+<% if (components.includes('infra')) { %>
+      infra: ${{ steps.filter.outputs.<%= paths.infra %> }}
+<% } %>
+    steps:
+      - uses: actions/checkout@v5
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+<% if (components.includes('fastapi')) { %>
+            <%= paths.fastapi %>:
+              - '<%= paths.fastapi %>/**'
+<% } %>
+<% if (components.includes('fastify')) { %>
+            <%= paths.fastify %>:
+              - '<%= paths.fastify %>/**'
+<% } %>
+<% if (components.includes('frontend')) { %>
+            <%= paths.frontend %>:
+              - '<%= paths.frontend %>/**'
+<% } %>
+<% if (components.includes('mobile')) { %>
+            <%= paths.mobile %>:
+              - '<%= paths.mobile %>/**'
+<% } %>
+<% if (components.includes('e2e')) { %>
+            <%= paths.e2e %>:
+              - '<%= paths.e2e %>/**'
+<% } %>
+<% if (components.includes('infra')) { %>
+            <%= paths.infra %>:
+              - '<%= paths.infra %>/**'
+<% } %>
 <% if (components.includes('fastapi')) { %>
+
   fastapi:
     name: FastAPI (format + lint)
+    needs: changes
+    if: needs.changes.outputs.fastapi == 'true'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -22,8 +79,11 @@ jobs:
       - run: uv run ruff check src tests
 <% } %>
 <% if (components.includes('fastify')) { %>
+
   fastify:
     name: Fastify (format + lint + typecheck)
+    needs: changes
+    if: needs.changes.outputs.fastify == 'true'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -45,8 +105,11 @@ jobs:
       - run: npx tsc --noEmit
 <% } %>
 <% if (components.includes('frontend')) { %>
+
   frontend:
     name: Frontend (format + lint + typecheck)
+    needs: changes
+    if: needs.changes.outputs.frontend == 'true'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -64,8 +127,11 @@ jobs:
       - run: npx tsc --noEmit
 <% } %>
 <% if (components.includes('mobile')) { %>
+
   mobile:
     name: Flutter (format + analyze)
+    needs: changes
+    if: needs.changes.outputs.mobile == 'true'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -81,8 +147,11 @@ jobs:
       - run: dart analyze --fatal-infos
 <% } %>
 <% if (components.includes('e2e')) { %>
+
   e2e:
     name: E2E (format + lint + typecheck)
+    needs: changes
+    if: needs.changes.outputs.e2e == 'true'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -100,8 +169,11 @@ jobs:
       - run: npx tsc --noEmit
 <% } %>
 <% if (components.includes('infra')) { %>
+
   infra:
     name: Terraform (fmt + validate)
+    needs: changes
+    if: needs.changes.outputs.infra == 'true'
     runs-on: ubuntu-latest
     defaults:
       run: