create-projx 1.3.0 → 1.3.2

package/dist/index.js

@@ -185,28 +185,43 @@ async function readFileOrNull(path) {
     return null;
   }
 }
-async function writeComponentMarker(dir, component, origin = "scaffold") {
+async function readComponentMarker(dir) {
+  const raw = await readFileOrNull(join(dir, COMPONENT_MARKER));
+  if (!raw) return null;
+  try {
+    const data = JSON.parse(raw);
+    return {
+      components: data.components ?? (data.component ? [data.component] : []),
+      origin: data.origin ?? "scaffold",
+      skip: data.skip
+    };
+  } catch {
+    return null;
+  }
+}
+async function writeComponentMarker(dir, component, origin = "scaffold", skip) {
   const markerPath = join(dir, COMPONENT_MARKER);
   let components = [component];
   let existingOrigin = origin;
+  let existingSkip = skip;
   const existing = await readFileOrNull(markerPath);
   if (existing) {
     try {
       const data = JSON.parse(existing);
       const prev = data.components ?? (data.component ? [data.component] : []);
-      existingOrigin = data.origin ?? origin;
+      existingOrigin = origin ?? data.origin ?? "scaffold";
+      existingSkip = skip ?? data.skip;
       if (!prev.includes(component)) {
         components = [...prev, component];
       } else {
-        return;
+        components = prev;
       }
     } catch {
     }
   }
-  await writeFile(
-    markerPath,
-    JSON.stringify({ components, origin: existingOrigin }, null, 2) + "\n"
-  );
+  const marker = { components, origin: existingOrigin };
+  if (existingSkip && existingSkip.length > 0) marker.skip = existingSkip;
+  await writeFile(markerPath, JSON.stringify(marker, null, 2) + "\n");
 }
 async function discoverComponentPaths(cwd, components) {
   const paths = {};
@@ -433,7 +448,43 @@ function removeWorktree(cwd, worktree) {
     }
   }
 }
-async function writeTemplateToDir(dest, repoDir, components, componentPaths, vars, version, origin) {
+function matchesSkip(filePath, patterns) {
+  for (const pattern of patterns) {
+    if (pattern === "**") return true;
+    if (pattern.endsWith("/**")) {
+      const prefix = pattern.slice(0, -3);
+      if (filePath.startsWith(prefix + "/") || filePath === prefix) return true;
+    }
+    if (pattern.startsWith("**/")) {
+      const suffix = pattern.slice(3);
+      if (filePath.endsWith(suffix) || filePath.includes("/" + suffix)) return true;
+    }
+    if (pattern.startsWith("*.")) {
+      const ext = pattern.slice(1);
+      if (filePath.endsWith(ext)) return true;
+    }
+    if (filePath === pattern) return true;
+  }
+  return false;
+}
+async function removeSkippedFiles(dir, skipPatterns) {
+  if (skipPatterns.length === 0) return;
+  const { readdir: readdir3, unlink } = await import("fs/promises");
+  const walk = async (current, base) => {
+    const entries = await readdir3(current, { withFileTypes: true });
+    for (const entry of entries) {
+      const full = join3(current, entry.name);
+      const rel = full.slice(base.length + 1);
+      if (entry.isDirectory()) {
+        await walk(full, base);
+      } else if (entry.name !== ".projx-component" && matchesSkip(rel, skipPatterns)) {
+        await unlink(full);
+      }
+    }
+  };
+  await walk(dir, dir);
+}
+async function writeTemplateToDir(dest, repoDir, components, componentPaths, vars, version, origin, componentSkips) {
   const name = vars.projectName;
   const nameSnake = toSnake(name);
   for (const component of components) {
@@ -450,7 +501,11 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
       }
       await rm2(join3(dest, "__tmp__"), { recursive: true, force: true });
     }
-    await writeComponentMarker(join3(dest, targetDir), component, origin);
+    const skipPatterns = componentSkips?.[component] ?? [];
+    if (skipPatterns.length > 0) {
+      await removeSkippedFiles(join3(dest, targetDir), skipPatterns);
+    }
+    await writeComponentMarker(join3(dest, targetDir), component, origin, skipPatterns.length > 0 ? skipPatterns : void 0);
   }
   await substituteNames(dest, components, componentPaths, name, nameSnake);
   const hasBackend = components.includes("fastapi") || components.includes("fastify");
@@ -498,10 +553,10 @@ async function substituteNames(dest, components, paths, name, nameSnake) {
     await replaceInDir(join3(dest, `${paths.mobile}`), "package:projx_mobile/", `package:${nameSnake}_mobile/`, ".dart");
   }
 }
-async function createBaseline(cwd, repoDir, components, componentPaths, vars, version, origin = "scaffold") {
+async function createBaseline(cwd, repoDir, components, componentPaths, vars, version, origin = "scaffold", componentSkips) {
   const worktree = createWorktree(cwd, BASELINE_BRANCH, true);
   try {
-    await writeTemplateToDir(worktree, repoDir, components, componentPaths, vars, version, origin);
+    await writeTemplateToDir(worktree, repoDir, components, componentPaths, vars, version, origin, componentSkips);
     execSync2("git add -A", { cwd: worktree, stdio: "pipe" });
     execSync2(
       `git commit --no-verify -m "projx: baseline template v${version} [${components.join(", ")}]"`,
@@ -511,11 +566,11 @@ async function createBaseline(cwd, repoDir, components, componentPaths, vars, ve
     removeWorktree(cwd, worktree);
   }
 }
-async function updateBaseline(cwd, repoDir, components, componentPaths, vars, version) {
+async function updateBaseline(cwd, repoDir, components, componentPaths, vars, version, componentSkips) {
   const worktree = createWorktree(cwd, BASELINE_BRANCH, false);
   try {
     execSync2("git rm -rf .", { cwd: worktree, stdio: "pipe" });
-    await writeTemplateToDir(worktree, repoDir, components, componentPaths, vars, version, "scaffold");
+    await writeTemplateToDir(worktree, repoDir, components, componentPaths, vars, version, "scaffold", componentSkips);
     execSync2("git add -A", { cwd: worktree, stdio: "pipe" });
     const diff = execSync2("git diff --cached --stat", { cwd: worktree, stdio: "pipe" }).toString().trim();
     if (!diff) {
@@ -571,9 +626,9 @@ function mergeBaseline(cwd, message, allowUnrelated = false, oursOnConflict = fa
     };
   }
 }
-async function reconstructBaseline(cwd, repoDir, components, componentPaths, vars, version) {
+async function reconstructBaseline(cwd, repoDir, components, componentPaths, vars, version, componentSkips) {
   p2.log.warn("projx/baseline branch not found. Reconstructing...");
-  await createBaseline(cwd, repoDir, components, componentPaths, vars, version);
+  await createBaseline(cwd, repoDir, components, componentPaths, vars, version, "scaffold", componentSkips);
   mergeBaseline(
     cwd,
     `projx: reconstructed baseline for template v${version}`,
@@ -767,15 +822,25 @@ async function update(cwd, localRepo) {
     const version = pkg.version;
     const name = detectProjectName(cwd, config.components, componentPaths);
     const vars = { projectName: name, components: config.components, paths: componentPaths };
+    const componentSkips = {};
+    for (const component of config.components) {
+      const dir = componentPaths[component];
+      const marker = await readComponentMarker(join5(cwd, dir));
+      if (marker?.skip && marker.skip.length > 0) {
+        componentSkips[component] = marker.skip;
+      } else if (marker?.origin === "init") {
+        componentSkips[component] = ["**"];
+      }
+    }
     if (!hasBaseline(cwd)) {
       const rebuildSpinner = p4.spinner();
       rebuildSpinner.start("Establishing baseline (first-time migration)");
-      await reconstructBaseline(cwd, repoDir, config.components, componentPaths, vars, config.version || version);
+      await reconstructBaseline(cwd, repoDir, config.components, componentPaths, vars, config.version || version, componentSkips);
       rebuildSpinner.stop("Baseline established.");
     }
     const updateSpinner = p4.spinner();
     updateSpinner.start("Updating baseline to latest template");
-    const { changed } = await updateBaseline(cwd, repoDir, config.components, componentPaths, vars, version);
+    const { changed } = await updateBaseline(cwd, repoDir, config.components, componentPaths, vars, version, componentSkips);
     if (!changed) {
       updateSpinner.stop("Already up to date.");
       p4.outro("No template changes to apply.");
@@ -786,6 +851,16 @@ async function update(cwd, localRepo) {
     mergeSpinner.start("Merging template changes");
     const result = mergeBaseline(cwd, `projx: update to template v${version}`);
     mergeSpinner.stop("Merge complete.");
+    if (result.status === "clean") {
+      const updatedConfig = {
+        ...config,
+        version,
+        baseline: { branch: "projx/baseline", templateVersion: version }
+      };
+      const { writeFile: writeFile3 } = await import("fs/promises");
+      await writeFile3(join5(cwd, ".projx"), JSON.stringify(updatedConfig, null, 2) + "\n");
+      execSync3("git add .projx && git commit --no-verify --amend --no-edit", { cwd, stdio: "pipe" });
+    }
     if (result.status === "conflicts") {
       p4.log.warn(`Merge conflicts in ${result.conflictedFiles.length} file(s):`);
       for (const f of result.conflictedFiles) {
@@ -1140,9 +1215,13 @@ async function init(cwd, localRepo) {
   try {
     const pkg = JSON.parse(await readFile6(join8(repoDir, "cli/package.json"), "utf-8"));
     const version = pkg.version;
+    const componentSkips = {};
+    for (const c of components) {
+      componentSkips[c] = ["**"];
+    }
     const baselineSpinner = p6.spinner();
     baselineSpinner.start("Creating template baseline");
-    await createBaseline(cwd, repoDir, components, paths, vars, version, "init");
+    await createBaseline(cwd, repoDir, components, paths, vars, version, "init", componentSkips);
     baselineSpinner.stop("Baseline created.");
     const mergeSpinner = p6.spinner();
     mergeSpinner.start("Merging baseline (preserving your code)");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-projx",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "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": {

package/src/templates/docker-compose.yml.ejs

@@ -2,21 +2,16 @@ services:
 <% if (components.includes('fastapi')) { %>
   migrate:
     build: ./<%= paths.fastapi %>
-    command: ['uv', 'run', 'migrate.py']
+    command: ["uv", "run", "migrate.py"]
     env_file:
       - ./<%= paths.fastapi %>/.env
-    deploy:
-      resources:
-        limits:
-          memory: 256M
-          cpus: '0.5'
     networks:
       - app-network
 
   backend:
     build: ./<%= paths.fastapi %>
     expose:
-      - '7860'
+      - "7860"
     env_file:
       - ./<%= paths.fastapi %>/.env
     restart: unless-stopped
@@ -26,27 +21,15 @@ services:
     healthcheck:
       test:
         [
-          'CMD',
-          'python',
-          '-c',
+          "CMD",
+          "python",
+          "-c",
           "import urllib.request; urllib.request.urlopen('http://localhost:7860/api/health')",
         ]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 15s
-    deploy:
-      resources:
-        limits:
-          memory: 512M
-          cpus: '1.0'
-        reservations:
-          memory: 256M
-    security_opt:
-      - no-new-privileges:true
-    read_only: true
-    tmpfs:
-      - /tmp
     networks:
       - app-network
 <% } %>
@@ -54,23 +37,16 @@ services:
   backend-fastify:
     build: ./<%= paths.fastify %>
     expose:
-      - '3000'
+      - "3000"
     env_file:
       - ./<%= paths.fastify %>/.env
     restart: unless-stopped
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', 'http://localhost:3000/api/health']
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:3000/api/health"]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 15s
-    deploy:
-      resources:
-        limits:
-          memory: 512M
-          cpus: '1.0'
-    security_opt:
-      - no-new-privileges:true
     networks:
       - app-network
 <% } %>
@@ -79,12 +55,10 @@ services:
     build:
       context: ./<%= paths.frontend %>
       args:
-        VITE_API_URL: ''
+        VITE_API_URL: ""
     ports:
-      - '80:80'
-      - '443:443'
-    environment:
-      - DOMAIN=${DOMAIN:-localhost}
+      - "80:80"
+      - "443:443"
     volumes:
       - letsencrypt:/etc/letsencrypt
       - certbot-www:/var/www/certbot
@@ -100,18 +74,11 @@ services:
 <% } %>
     restart: unless-stopped
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', 'http://localhost:80/']
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:80/"]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 10s
-    deploy:
-      resources:
-        limits:
-          memory: 128M
-          cpus: '0.5'
-    security_opt:
-      - no-new-privileges:true
     networks:
       - app-network
 
@@ -127,11 +94,6 @@ services:
         condition: service_healthy
     profiles:
       - ssl
-    deploy:
-      resources:
-        limits:
-          memory: 64M
-          cpus: '0.25'
     networks:
       - app-network
 <% } %>