create-projx 1.6.3 → 1.6.4

package/README.md

@@ -39,7 +39,7 @@ Ask an LLM to "scaffold a full-stack app" and you get 50 files of plausible-look
 ```bash
 npx create-projx my-app       # interactive — pick exactly what you need
 cd my-app
-./setup.sh                    # installs everything you picked
+./scripts/setup.sh            # installs everything you picked
 ```
 
 Pick any combination of components — they're all optional:
@@ -116,7 +116,7 @@ npx create-projx my-app -y
 
 ## Package Manager Support
 
-Projx supports **npm**, **pnpm**, **yarn**, and **bun**. During `create`, you're prompted to pick one. The choice is stored in `.projx` and used everywhere — setup.sh, Docker, CI, pre-commit hooks, and README.
+Projx supports **npm**, **pnpm**, **yarn**, and **bun**. During `create`, you're prompted to pick one. The choice is stored in `.projx` and used everywhere — `scripts/setup.sh`, Docker, CI, pre-commit hooks, and README.
 
 ```json
 { "packageManager": "pnpm" }
@@ -166,7 +166,7 @@ Need a second backend service alongside an existing one (e.g. an SMTP listener n
 npx create-projx add fastify --name email-ingestor
 ```
 
-Creates `email-ingestor/` with the fastify scaffold and a `.projx-component` marker. Each instance gets its own job in `.github/workflows/ci.yml`, its own section in `.githooks/pre-commit`, and its own install step in `setup.sh`. `update` keeps every instance refreshed on every run.
+Creates `email-ingestor/` with the fastify scaffold and a `.projx-component` marker. Each instance gets its own job in `.github/workflows/ci.yml`, its own section in `.githooks/pre-commit`, and its own install step in `scripts/setup.sh`. `update` keeps every instance refreshed on every run.
 
 ### Update Scaffolding
 
@@ -191,7 +191,7 @@ Common user-owned files are **default-skipped** automatically — template updat
 
 | Scope | Default skips |
 |-------|---------------|
-| Root (`.projx`) | `docker-compose.yml`, `docker-compose.dev.yml`, `README.md`, `.githooks/pre-commit`, `.github/workflows/ci.yml`, `setup.sh` |
+| Root (`.projx`) | `docker-compose.yml`, `docker-compose.dev.yml`, `README.md`, `.githooks/pre-commit`, `.github/workflows/ci.yml`, `scripts/setup.sh`, `scripts/setup-docker.sh`, `scripts/setup-ssl.sh` |
 | fastapi | `pyproject.toml` |
 | fastify / frontend / e2e | `package.json` |
 | mobile | `pubspec.yaml` |
@@ -336,7 +336,7 @@ backend/.projx-component  →  { "components": ["fastapi"] }
 web/.projx-component      →  { "components": ["frontend"] }
 ```
 
-CI, setup.sh, pre-commit hooks, and docker-compose are all regenerated with your custom directory names.
+CI, `scripts/setup.sh`, pre-commit hooks, and docker-compose are all regenerated with your custom directory names.
 
 ## What a Scaffolded Project Looks Like
 
@@ -353,7 +353,7 @@ my-app/
 ├── .github/workflows/      # CI per component (runs only on changes)
 ├── .githooks/pre-commit    # Format + lint on commit
 ├── .vscode/                # Editor settings + recommended extensions
-├── setup.sh                # Install all deps
+├── scripts/                # setup.sh, setup-docker.sh, setup-ssl.sh
 └── .projx                  # Components list + version
 ```
 
@@ -378,7 +378,7 @@ Contributing to Projx itself:
 ```bash
 git clone https://github.com/ukanhaupa/projx.git
 cd projx
-./setup.sh
+./scripts/setup.sh
 ```
 
 The CLI lives in `cli/`. Templates are the root-level component directories (`fastapi/`, `frontend/`, etc.).

package/dist/{baseline-RXPDDEDD.js → baseline-PZM4KJJW.js}

@@ -8,8 +8,8 @@ import {
   matchesSkip,
   saveBaselineRef,
   writeTemplateToDir
-} from "./chunk-OBYYB6PR.js";
-import "./chunk-LYPPFXGK.js";
+} from "./chunk-XQ7FE4U3.js";
+import "./chunk-6YRBHJ2V.js";
 export {
   BASELINE_REF,
   applyTemplate,

package/dist/{chunk-LYPPFXGK.js → chunk-6YRBHJ2V.js}

@@ -1,7 +1,15 @@
 // src/utils.ts
 import { execSync } from "child_process";
 import { existsSync, readFileSync } from "fs";
-import { cp, mkdir, readdir, readFile, rm, writeFile } from "fs/promises";
+import {
+  chmod,
+  cp,
+  mkdir,
+  readdir,
+  readFile,
+  rm,
+  writeFile
+} from "fs/promises";
 import { join, resolve } from "path";
 import { tmpdir } from "os";
 import { fileURLToPath } from "url";
@@ -205,10 +213,19 @@ async function copyStaticFiles(repoDir, dest) {
     await cp(extensionsJson, join(dest, ".vscode/extensions.json"));
     manifest.push(".vscode/extensions.json");
   }
-  const scripts = join(tpl, "scripts");
-  if (existsSync(scripts)) {
-    await cp(scripts, join(dest, "scripts"), { recursive: true });
-    manifest.push("scripts/setup-ssl.sh");
+  const staticScripts = ["setup-docker.sh", "setup-ssl.sh"];
+  const scriptsSrc = join(tpl, "scripts");
+  if (existsSync(scriptsSrc)) {
+    await mkdir(join(dest, "scripts"), { recursive: true });
+    for (const file of staticScripts) {
+      const src = join(scriptsSrc, file);
+      const dst = join(dest, "scripts", file);
+      if (existsSync(src) && !existsSync(dst)) {
+        await cp(src, dst);
+        await chmod(dst, 493);
+        manifest.push(`scripts/${file}`);
+      }
+    }
   }
   return manifest;
 }
@@ -313,7 +330,9 @@ var DEFAULT_ROOT_SKIP_PATTERNS = [
   "README.md",
   ".githooks/pre-commit",
   ".github/workflows/ci.yml",
-  "setup.sh"
+  "scripts/setup.sh",
+  "scripts/setup-docker.sh",
+  "scripts/setup-ssl.sh"
 ];
 var DEFAULT_COMPONENT_SKIP_PATTERNS = {
   fastapi: ["pyproject.toml"],
@@ -446,12 +465,17 @@ function renderLines(lines, vars) {
       continue;
     }
     if (stack.length > 0 && stack.some((v) => !v.active)) continue;
-    const replaced = line.replace(/<%=\s*([\w.]+)\s*%>/g, (_, expr) => {
-      const parts = expr.split(".");
-      let val = vars;
-      for (const p of parts) {
-        val = val?.[p];
+    const replaced = line.replace(/<%=\s*(.+?)\s*%>/g, (_, expr) => {
+      const trimmed = expr.trim();
+      if (/^[\w.]+$/.test(trimmed)) {
+        const parts = trimmed.split(".");
+        let val2 = vars;
+        for (const p of parts) {
+          val2 = val2?.[p];
+        }
+        return String(val2 ?? "");
       }
+      const val = evalExpr(trimmed, vars);
       return String(val ?? "");
     });
     output.push(replaced);

package/dist/{chunk-OBYYB6PR.js → chunk-XQ7FE4U3.js}

@@ -13,7 +13,7 @@ import {
   toSnake,
   upsertComponentMarker,
   writeProjxConfig
-} from "./chunk-LYPPFXGK.js";
+} from "./chunk-6YRBHJ2V.js";
 
 // src/baseline.ts
 import { existsSync, writeFileSync, unlinkSync } from "fs";
@@ -44,7 +44,10 @@ var CANONICAL_DISPLAY = {
   infra: "Terraform"
 };
 function withInstances(vars) {
-  const base = vars.instances && vars.instances.length > 0 ? vars.instances : vars.components.map((type) => ({ type, path: vars.paths[type] ?? type }));
+  const base = vars.instances && vars.instances.length > 0 ? vars.instances : vars.components.map((type) => ({
+    type,
+    path: vars.paths[type] ?? type
+  }));
   const enriched = base.map((inst) => ({
     ...inst,
     upper: shellSafeUpper(inst.path),
@@ -124,7 +127,7 @@ function generateVscodeSettings(vars) {
 // src/baseline.ts
 var BASELINE_REF = "refs/projx/baseline";
 async function migrateComponentMarkers(cwd, components, componentPaths, applyDefaults) {
-  const { readComponentMarker: readComponentMarker2, writeComponentMarker } = await import("./utils-BXHJP6HF.js");
+  const { readComponentMarker: readComponentMarker2, writeComponentMarker } = await import("./utils-AVKSTHIF.js");
   for (const component of components) {
     const dir = componentPaths[component];
     const markerDir = join2(cwd, dir);
@@ -392,7 +395,10 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
     type,
     path: componentPaths[type]
   }));
-  const allInstances = [...primaryInstances, ...extraInstances];
+  const allInstances = [
+    ...primaryInstances,
+    ...extraInstances
+  ];
   const toScaffold = instancesToScaffold ?? allInstances;
   for (const inst of toScaffold) {
     await writeOneInstance(inst, {
@@ -444,9 +450,13 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
       await generateCiYml(vars)
     );
   }
-  if (shouldWrite("setup.sh")) {
-    await writeFile(join2(dest, "setup.sh"), await generateSetupSh(vars));
-    await chmod(join2(dest, "setup.sh"), 493);
+  if (shouldWrite("scripts/setup.sh")) {
+    await mkdir(join2(dest, "scripts"), { recursive: true });
+    await writeFile(
+      join2(dest, "scripts/setup.sh"),
+      await generateSetupSh(vars)
+    );
+    await chmod(join2(dest, "scripts/setup.sh"), 493);
   }
   await copyStaticFiles(repoDir, dest);
   if (shouldWrite(".vscode/settings.json")) {
@@ -459,14 +469,26 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
   await writeManagedProjx(dest, version, vars, applyDefaults);
 }
 async function writeOneInstance(inst, opts) {
-  const { dest, repoDir, vars, componentPaths, realCwd, applyDefaults, baseSkip, projectName, nameSnake } = opts;
+  const {
+    dest,
+    repoDir,
+    vars,
+    componentPaths,
+    realCwd,
+    applyDefaults,
+    baseSkip,
+    projectName,
+    nameSnake
+  } = opts;
   const { type, path: targetDir } = inst;
   const realMarker = await readComponentMarker(join2(realCwd, targetDir));
   const isNewMarker = !realMarker;
   const shouldApplyComponentDefault = isNewMarker || applyDefaults;
   const markerSkip = realMarker?.skip ?? [];
   const defaultSkip = shouldApplyComponentDefault ? DEFAULT_COMPONENT_SKIP_PATTERNS[type] ?? [] : [];
-  const skipPatterns = [.../* @__PURE__ */ new Set([...baseSkip, ...markerSkip, ...defaultSkip])];
+  const skipPatterns = [
+    .../* @__PURE__ */ new Set([...baseSkip, ...markerSkip, ...defaultSkip])
+  ];
   const tmpDir = join2(dest, "__cptmp__");
   await copyComponent(repoDir, type, tmpDir);
   const srcDir = join2(tmpDir, type);
@@ -480,33 +502,62 @@ async function writeOneInstance(inst, opts) {
     await cp(srcDir, outDir, { recursive: true, force: true });
   }
   await rm(tmpDir, { recursive: true, force: true });
-  const instancePaths = { ...componentPaths, [type]: targetDir };
+  const instancePaths = {
+    ...componentPaths,
+    [type]: targetDir
+  };
   await renderEjsInDir(outDir, { ...vars, paths: instancePaths });
   await upsertComponentMarker(
     join2(dest, targetDir),
     type,
     skipPatterns.length > 0 ? skipPatterns : void 0
   );
-  await substituteNamesForInstance(inst, dest, projectName, nameSnake, vars.nameOverrides);
+  await substituteNamesForInstance(
+    inst,
+    dest,
+    projectName,
+    nameSnake,
+    vars.nameOverrides
+  );
 }
 async function substituteNamesForInstance(inst, dest, name, nameSnake, overrides) {
   const { type, path } = inst;
   const isCanonical = path === type;
   if (type === "fastapi") {
     const target = isCanonical ? overrides?.fastapi ?? `${name}-fastapi` : `${name}-${path}`;
-    await replaceInFile(join2(dest, `${path}/pyproject.toml`), "projx-fastapi", target);
+    await replaceInFile(
+      join2(dest, `${path}/pyproject.toml`),
+      "projx-fastapi",
+      target
+    );
   } else if (type === "fastify") {
     const target = isCanonical ? overrides?.fastify ?? `${name}-fastify` : `${name}-${path}`;
-    await replaceInFile(join2(dest, `${path}/package.json`), "projx-fastify", target);
+    await replaceInFile(
+      join2(dest, `${path}/package.json`),
+      "projx-fastify",
+      target
+    );
   } else if (type === "frontend") {
     const target = isCanonical ? overrides?.frontend ?? `${name}-frontend` : `${name}-${path}`;
-    await replaceInFile(join2(dest, `${path}/package.json`), "projx-frontend", target);
+    await replaceInFile(
+      join2(dest, `${path}/package.json`),
+      "projx-frontend",
+      target
+    );
   } else if (type === "e2e") {
     const target = isCanonical ? overrides?.e2e ?? `${name}-e2e` : `${name}-${path}`;
-    await replaceInFile(join2(dest, `${path}/package.json`), "projx-e2e", target);
+    await replaceInFile(
+      join2(dest, `${path}/package.json`),
+      "projx-e2e",
+      target
+    );
   } else if (type === "mobile") {
     const target = isCanonical ? overrides?.mobile ?? `${nameSnake}_mobile` : toSnake(`${nameSnake}_${path}`);
-    await replaceInFile(join2(dest, `${path}/pubspec.yaml`), "projx_mobile", target);
+    await replaceInFile(
+      join2(dest, `${path}/pubspec.yaml`),
+      "projx_mobile",
+      target
+    );
     await replaceInDir(
       join2(dest, path),
       "package:projx_mobile/",

package/dist/index.js

@@ -9,10 +9,11 @@ import {
   matchesSkip,
   saveBaselineRef,
   writeTemplateToDir
-} from "./chunk-OBYYB6PR.js";
+} from "./chunk-XQ7FE4U3.js";
 import {
   COMPONENTS,
   COMPONENT_MARKER,
+  DEFAULT_ROOT_SKIP_PATTERNS,
   EXCLUDE,
   PACKAGE_MANAGERS,
   cleanupRepo,
@@ -33,7 +34,7 @@ import {
   toTitle,
   writeComponentMarker,
   writeProjxConfig
-} from "./chunk-LYPPFXGK.js";
+} from "./chunk-6YRBHJ2V.js";
 
 // src/index.ts
 import { existsSync as existsSync11 } from "fs";
@@ -164,7 +165,7 @@ async function scaffold(opts, dest, localRepo) {
     `Done! Next steps:
 
   cd ${name}
-  ./setup.sh
+  ./scripts/setup.sh
 
   Like projx? Star it: https://github.com/ukanhaupa/projx`
   );
@@ -474,7 +475,7 @@ function hasUncommittedChanges(cwd) {
 async function findPinnedFilesWithUpdates(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip) {
   const { mkdir: mkdir5, rm: rm2, readFile: readFile7 } = await import("fs/promises");
   const { tmpdir: tmpdir2 } = await import("os");
-  const { writeTemplateToDir: writeTemplateToDir2 } = await import("./baseline-RXPDDEDD.js");
+  const { writeTemplateToDir: writeTemplateToDir2 } = await import("./baseline-PZM4KJJW.js");
   const config = await readProjxConfig(cwd);
   const rootPinned = Array.isArray(config.skip) ? config.skip : [];
   const componentPinned = [];
@@ -806,7 +807,9 @@ async function addInstance(cwd, type, customName, config, existing, localRepo, s
     const INSTANCE_AWARE_ROOT = /* @__PURE__ */ new Set([
       ".github/workflows/ci.yml",
       ".githooks/pre-commit",
-      "setup.sh"
+      "scripts/setup.sh",
+      "docker-compose.yml",
+      "docker-compose.dev.yml"
     ]);
     const rawSkip = Array.isArray(config.skip) ? config.skip : [];
     const rootSkip = rawSkip.filter((p11) => !INSTANCE_AWARE_ROOT.has(p11));
@@ -1056,12 +1059,14 @@ async function init(cwd, localRepo) {
   spinner7.stop(
     detected.length > 0 ? `Found ${detected.length} component(s).` : "No components detected."
   );
-  let confirmed;
-  if (detected.length > 0) {
-    confirmed = await confirmDetections(detected);
-  } else {
-    confirmed = await manualSelect(cwd);
+  if (detected.length === 0) {
+    await writeBareProjx(cwd, localRepo, isLocal, detectPackageManager(cwd));
+    p5.outro(
+      "Initialized empty .projx. Add components with 'npx create-projx add <component>'."
+    );
+    return;
   }
+  const confirmed = await confirmDetections(detected);
   if (confirmed.length === 0) {
     p5.log.warn("No components selected. Nothing to do.");
     process.exit(0);
@@ -1161,6 +1166,36 @@ async function init(cwd, localRepo) {
     await cleanupRepo(repoDir, isLocal);
   }
 }
+async function writeBareProjx(cwd, localRepo, isLocal, pm) {
+  const dlSpinner = p5.spinner();
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
+  const repoDir = await downloadRepo(localRepo).catch((err) => {
+    dlSpinner.stop("Failed.");
+    p5.log.error(String(err));
+    process.exit(1);
+  });
+  dlSpinner.stop(isLocal ? "Local templates loaded." : "Templates downloaded.");
+  try {
+    const pkg = JSON.parse(
+      await readFile4(join5(repoDir, "cli/package.json"), "utf-8")
+    );
+    const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+    const config = {
+      version: pkg.version,
+      createdAt: today,
+      updatedAt: today,
+      skip: [...DEFAULT_ROOT_SKIP_PATTERNS],
+      defaultsApplied: true
+    };
+    if (pm) config.packageManager = pm;
+    await writeProjxConfig(cwd, config);
+    saveBaselineRef(cwd);
+  } finally {
+    await cleanupRepo(repoDir, isLocal);
+  }
+}
 async function confirmDetections(detected) {
   const confirmed = [];
   for (const d of detected) {
@@ -1175,33 +1210,6 @@ async function confirmDetections(detected) {
   }
   return confirmed;
 }
-async function manualSelect(cwd) {
-  const selected = await p5.multiselect({
-    message: "No components detected. Select manually:",
-    options: COMPONENTS.map((c) => ({
-      value: c,
-      label: LABELS[c].label,
-      hint: LABELS[c].hint
-    })),
-    required: false
-  });
-  if (p5.isCancel(selected)) process.exit(0);
-  const result = [];
-  for (const component of selected) {
-    const dir = await p5.text({
-      message: `Directory for ${LABELS[component].label}?`,
-      placeholder: component,
-      defaultValue: component
-    });
-    if (p5.isCancel(dir)) process.exit(0);
-    if (!existsSync5(join5(cwd, dir))) {
-      p5.log.warn(`${dir}/ does not exist \u2014 skipping.`);
-      continue;
-    }
-    result.push({ component, directory: dir });
-  }
-  return result;
-}
 function isGitRepo2(cwd) {
   try {
     execSync2("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });

package/dist/{utils-BXHJP6HF.js → utils-AVKSTHIF.js}

@@ -33,7 +33,7 @@ import {
   upsertComponentMarker,
   writeComponentMarker,
   writeProjxConfig
-} from "./chunk-LYPPFXGK.js";
+} from "./chunk-6YRBHJ2V.js";
 export {
   COMPONENTS,
   COMPONENT_MARKER,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-projx",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "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/README.md.ejs

@@ -30,7 +30,7 @@ Scaffolded with [Projx](https://github.com/ukanhaupa/projx).
 ## Getting Started
 
 ```bash
-./setup.sh                                   # Install all dependencies
+./scripts/setup.sh                           # Install all dependencies
 docker compose -f docker-compose.dev.yml up  # Start with Docker (dev mode)
 ```
 <% if (components.includes('fastapi')) { %>

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

@@ -1,5 +1,5 @@
 services:
-<% if (components.includes('fastapi') || components.includes('fastify')) { %>
+<% if (fastapiInstances.length > 0 || fastifyInstances.length > 0) { %>
   db:
     image: postgres:16-alpine
     environment:
@@ -23,9 +23,9 @@ services:
     networks:
       - app-network
 <% } %>
-<% if (components.includes('fastapi')) { %>
-  <%= paths.fastapi %>-migrate:
-    build: ./<%= paths.fastapi %>
+<% for (const inst of fastapiInstances) { %>
+  <%= inst.path %>-migrate:
+    build: ./<%= inst.path %>
     command: ['uv', 'run', 'migrate.py']
     environment:
       - SQLALCHEMY_DATABASE_URI=postgresql+asyncpg://dev:dev@db:5432/app
@@ -39,16 +39,21 @@ services:
           cpus: '0.5'
     networks:
       - app-network
-  <%= paths.fastapi %>:
-    build: ./<%= paths.fastapi %>
+  <%= inst.path %>:
+    build: ./<%= inst.path %>
     command:
       [
         'uv', 'run', 'uvicorn', 'src.app:app',
         '--host', '0.0.0.0', '--port', '7860',
         '--workers', '2', '--timeout-keep-alive', '120', '--reload',
       ]
+<% if (inst.path === inst.type) { %>
     ports:
       - '7860:7860'
+<% } else { %>
+    expose:
+      - '7860'
+<% } %>
     environment:
       - SQLALCHEMY_DATABASE_URI=postgresql+asyncpg://dev:dev@db:5432/app
       - CORS_ALLOW_ORIGINS=http://localhost:3000,http://localhost
@@ -56,11 +61,11 @@ services:
       - JWT_SECRET=dev-secret-that-is-at-least-32-bytes-long
       - JWT_ALGORITHMS=HS256
     volumes:
-      - ./<%= paths.fastapi %>/src:/app/src
-      - ./<%= paths.fastapi %>/alembic.ini:/app/alembic.ini
-      - ./<%= paths.fastapi %>/migrate.py:/app/migrate.py
+      - ./<%= inst.path %>/src:/app/src
+      - ./<%= inst.path %>/alembic.ini:/app/alembic.ini
+      - ./<%= inst.path %>/migrate.py:/app/migrate.py
     depends_on:
-      <%= paths.fastapi %>-migrate:
+      <%= inst.path %>-migrate:
         condition: service_completed_successfully
     restart: unless-stopped
     healthcheck:
@@ -81,9 +86,9 @@ services:
     networks:
       - app-network
 <% } %>
-<% if (components.includes('fastify')) { %>
-  <%= paths.fastify %>-migrate:
-    build: ./<%= paths.fastify %>
+<% for (const inst of fastifyInstances) { %>
+  <%= inst.path %>-migrate:
+    build: ./<%= inst.path %>
     command: ["sh", "-c", "<%= pm.prismaExec %> migrate deploy"]
     environment:
       - DATABASE_URL=postgresql://dev:dev@db:5432/app
@@ -97,20 +102,25 @@ services:
           cpus: '0.5'
     networks:
       - app-network
-  <%= paths.fastify %>:
-    build: ./<%= paths.fastify %>
+  <%= inst.path %>:
+    build: ./<%= inst.path %>
     command: ["sh", "-c", "<%= pm.runDev %>"]
+<% if (inst.path === inst.type) { %>
     ports:
       - '3000:3000'
+<% } else { %>
+    expose:
+      - '3000'
+<% } %>
     environment:
       - DATABASE_URL=postgresql://dev:dev@db:5432/app
       - CORS_ALLOW_ORIGINS=http://localhost:5173,http://localhost
       - JWT_PROVIDER=shared_secret
       - JWT_SECRET=dev-secret-that-is-at-least-32-bytes-long
     volumes:
-      - ./<%= paths.fastify %>/src:/app/src
+      - ./<%= inst.path %>/src:/app/src
     depends_on:
-      <%= paths.fastify %>-migrate:
+      <%= inst.path %>-migrate:
         condition: service_completed_successfully
     restart: unless-stopped
     healthcheck:
@@ -127,25 +137,30 @@ services:
     networks:
       - app-network
 <% } %>
-<% if (components.includes('frontend')) { %>
-  frontend:
+<% for (const inst of frontendInstances) { %>
+  <%= inst.path %>:
     image: node:20-alpine
     working_dir: /app
     command: sh -c "<%= pm.install %> && <%= pm.run %> dev -- --host 0.0.0.0"
+<% if (inst.path === inst.type) { %>
     ports:
       - '5173:5173'
+<% } else { %>
+    expose:
+      - '5173'
+<% } %>
     env_file:
-      - ./<%= paths.frontend %>/.env
+      - ./<%= inst.path %>/.env
     volumes:
-      - ./<%= paths.frontend %>:/app
-      - frontend_node_modules:/app/node_modules
-<% if (components.includes('fastify')) { %>
+      - ./<%= inst.path %>:/app
+      - <%= inst.upper.toLowerCase() %>_node_modules:/app/node_modules
+<% if (fastifyInstances.length > 0) { %>
     depends_on:
-      <%= paths.fastify %>:
+      <%= fastifyInstances[0].path %>:
         condition: service_healthy
-<% } else if (components.includes('fastapi')) { %>
+<% } else if (fastapiInstances.length > 0) { %>
     depends_on:
-      <%= paths.fastapi %>:
+      <%= fastapiInstances[0].path %>:
         condition: service_healthy
 <% } %>
     healthcheck:
@@ -163,11 +178,11 @@ services:
       - app-network
 <% } %>
 volumes:
-<% if (components.includes('fastapi') || components.includes('fastify')) { %>
+<% if (fastapiInstances.length > 0 || fastifyInstances.length > 0) { %>
   pgdata:
 <% } %>
-<% if (components.includes('frontend')) { %>
-  frontend_node_modules:
+<% for (const inst of frontendInstances) { %>
+  <%= inst.upper.toLowerCase() %>_node_modules:
 <% } %>
 networks:
   app-network:

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

@@ -1,21 +1,21 @@
 services:
-<% if (components.includes('fastapi')) { %>
-  <%= paths.fastapi %>-migrate:
-    build: ./<%= paths.fastapi %>
+<% for (const inst of fastapiInstances) { %>
+  <%= inst.path %>-migrate:
+    build: ./<%= inst.path %>
     command: ["uv", "run", "migrate.py"]
     env_file:
-      - ./<%= paths.fastapi %>/.env
+      - ./<%= inst.path %>/.env
     networks:
       - app-network
-  <%= paths.fastapi %>:
-    build: ./<%= paths.fastapi %>
+  <%= inst.path %>:
+    build: ./<%= inst.path %>
     expose:
       - "7860"
     env_file:
-      - ./<%= paths.fastapi %>/.env
+      - ./<%= inst.path %>/.env
     restart: unless-stopped
     depends_on:
-      <%= paths.fastapi %>-migrate:
+      <%= inst.path %>-migrate:
         condition: service_completed_successfully
     healthcheck:
       test:
@@ -32,23 +32,23 @@ services:
     networks:
       - app-network
 <% } %>
-<% if (components.includes('fastify')) { %>
-  <%= paths.fastify %>-migrate:
-    build: ./<%= paths.fastify %>
+<% for (const inst of fastifyInstances) { %>
+  <%= inst.path %>-migrate:
+    build: ./<%= inst.path %>
     command: ["sh", "-c", "<%= pm.prismaExec %> migrate deploy"]
     env_file:
-      - ./<%= paths.fastify %>/.env
+      - ./<%= inst.path %>/.env
     networks:
       - app-network
-  <%= paths.fastify %>:
-    build: ./<%= paths.fastify %>
+  <%= inst.path %>:
+    build: ./<%= inst.path %>
     expose:
       - "3000"
     env_file:
-      - ./<%= paths.fastify %>/.env
+      - ./<%= inst.path %>/.env
     restart: unless-stopped
     depends_on:
-      <%= paths.fastify %>-migrate:
+      <%= inst.path %>-migrate:
         condition: service_completed_successfully
     healthcheck:
       test: ["CMD", "wget", "--spider", "-q", "http://localhost:3000/api/health"]
@@ -59,10 +59,10 @@ services:
     networks:
       - app-network
 <% } %>
-<% if (components.includes('frontend')) { %>
-  frontend:
+<% for (const inst of frontendInstances) { %>
+  <%= inst.path %>:
     build:
-      context: ./<%= paths.frontend %>
+      context: ./<%= inst.path %>
       args:
         VITE_API_URL: ""
     ports:
@@ -71,13 +71,13 @@ services:
     volumes:
       - letsencrypt:/etc/letsencrypt
       - certbot-www:/var/www/certbot
-<% if (components.includes('fastify')) { %>
+<% if (fastifyInstances.length > 0) { %>
     depends_on:
-      <%= paths.fastify %>:
+      <%= fastifyInstances[0].path %>:
         condition: service_healthy
-<% } else if (components.includes('fastapi')) { %>
+<% } else if (fastapiInstances.length > 0) { %>
     depends_on:
-      <%= paths.fastapi %>:
+      <%= fastapiInstances[0].path %>:
         condition: service_healthy
 <% } %>
     restart: unless-stopped
@@ -89,6 +89,8 @@ services:
       start_period: 10s
     networks:
       - app-network
+<% } %>
+<% if (frontendInstances.length > 0) { %>
   certbot:
     image: certbot/certbot:latest
     volumes:
@@ -97,14 +99,14 @@ services:
     entrypoint: /bin/sh -c "trap exit TERM; while :; do certbot renew --quiet; sleep 12h & wait $${!}; done"
     restart: unless-stopped
     depends_on:
-      frontend:
+      <%= frontendInstances[0].path %>:
         condition: service_healthy
     profiles:
       - ssl
     networks:
       - app-network
 <% } %>
-<% if (components.includes('frontend')) { %>
+<% if (frontendInstances.length > 0) { %>
 volumes:
   letsencrypt:
   certbot-www: