create-projx 1.6.4 → 1.7.0

package/src/templates/pre-commit.ejs

@@ -4,17 +4,20 @@ set -e
 # ── Secret detection ──────────────────────────────────────────────
 STAGED_DIFF="$(git diff --cached --diff-filter=ACMR)"
 
-if echo "$STAGED_DIFF" | grep -qE '(AKIA|ASIA)[A-Z0-9]{16}'; then
-  echo "ERROR: Possible AWS access key detected in staged changes."
+AKIA_HITS="$(echo "$STAGED_DIFF" | grep -E '(AKIA|ASIA)[A-Z0-9]{16}' | grep -vE '(pragma: allowlist secret|gitleaks:allow)' || true)"
+if [ -n "$AKIA_HITS" ]; then
+  echo "ERROR: Possible AWS access key detected in staged changes:"
+  echo "$AKIA_HITS" | head -5
+  echo "Add 'pragma: allowlist secret' on the line to whitelist if intentional."
   exit 1
 fi
 
 if echo "$STAGED_DIFF" | grep -qE '(password|secret|token)\s*[:=]\s*["\x27][^"'\'']{8,}' 2>/dev/null; then
-  REAL_SECRETS="$(echo "$STAGED_DIFF" | grep -E '(password|secret|token)\s*[:=]\s*["\x27][^"'\'']{8,}' | grep -vE '(test-secret|dev-secret|example|placeholder|your-|changeme|CHANGE_ME)' || true)"
+  REAL_SECRETS="$(echo "$STAGED_DIFF" | grep -E '(password|secret|token)\s*[:=]\s*["\x27][^"'\'']{8,}' | grep -vE '(test-secret|dev-secret|example|placeholder|your-|changeme|CHANGE_ME|pragma: allowlist secret|gitleaks:allow)' || true)"
   if [ -n "$REAL_SECRETS" ]; then
     echo "WARNING: Possible secret detected in staged changes:"
     echo "$REAL_SECRETS" | head -5
-    echo "If intentional, commit with: git commit --no-verify"
+    echo "Add 'pragma: allowlist secret' on the line to whitelist, or commit with --no-verify if intentional."
     exit 1
   fi
 fi
@@ -36,12 +39,33 @@ if [ -n "$<%= inst.upper %>_PY" ]; then
   echo "$<%= inst.upper %>_PY" | sed 's|^<%= inst.path %>/||' | xargs uv run ruff format
   echo "$<%= inst.upper %>_PY" | sed 's|^<%= inst.path %>/||' | xargs uv run ruff check --fix
   uv run mypy
+  if grep -rEn 'from src\.[a-z_]+(\.[a-z_]+)?\._[a-z_]+ import' src/; then
+    echo "ERROR: src/ files cannot import from another module's _-prefixed file. Import from the package."
+    exit 1
+  fi
+  uv run lint-imports
   cd ..
   echo "$<%= inst.upper %>_PY" | xargs git add
 fi
 <% } %>
 <% for (const inst of fastifyInstances) { %>
 
+<%= inst.upper %>_TS=$(echo "$STAGED_FILES" | grep '^<%= inst.path %>/.*\.ts$' || true)
+<%= inst.upper %>_ALL=$(echo "$STAGED_FILES" | grep '^<%= inst.path %>/' || true)
+if [ -n "$<%= inst.upper %>_ALL" ]; then
+  echo "Formatting <%= inst.path %>..."
+  cd <%= inst.path %>
+  echo "$<%= inst.upper %>_ALL" | sed 's|^<%= inst.path %>/||' | xargs <%= pm.exec %> prettier --write --ignore-unknown
+  if [ -n "$<%= inst.upper %>_TS" ]; then
+    echo "$<%= inst.upper %>_TS" | sed 's|^<%= inst.path %>/||' | xargs <%= pm.exec %> eslint --fix
+    <%= pm.exec %> tsc --noEmit
+  fi
+  cd ..
+  echo "$<%= inst.upper %>_ALL" | xargs git add
+fi
+<% } %>
+<% for (const inst of expressInstances) { %>
+
 <%= inst.upper %>_TS=$(echo "$STAGED_FILES" | grep '^<%= inst.path %>/.*\.ts$' || true)
 <%= inst.upper %>_ALL=$(echo "$STAGED_FILES" | grep '^<%= inst.path %>/' || true)
 if [ -n "$<%= inst.upper %>_ALL" ]; then

package/src/templates/setup.sh.ejs

@@ -5,28 +5,117 @@ git config core.hooksPath .githooks
 echo "Git hooks configured."
 <% for (const inst of fastapiInstances) { %>
 
-cd <%= inst.path %> && uv sync --all-extras && cd ..
+(
+  cd <%= inst.path %>
+  uv sync --all-extras
+)
+if [ ! -f <%= inst.path %>/.env ] && [ -f <%= inst.path %>/.env.example ]; then
+  cp <%= inst.path %>/.env.example <%= inst.path %>/.env
+  echo "<%= inst.path %>/.env created from .env.example."
+fi
 echo "<%= inst.display %> dependencies installed."
 <% } %>
 <% for (const inst of fastifyInstances) { %>
 
-cd <%= inst.path %> && <%= pm.ci %> && cd ..
+(
+  cd <%= inst.path %>
+  <%= pm.install %>
+<% if (orm === 'drizzle') { %>
+  if [ -f drizzle.config.ts ]; then
+    if [ -n "$DATABASE_URL" ]; then
+      <%= pm.exec %> drizzle-kit push --force
+    else
+      echo "<%= inst.display %>: skipping Drizzle schema push (DATABASE_URL not set)."
+    fi
+  fi
+<% } else if (orm === 'sequelize' || orm === 'typeorm') { %>
+  if [ -f scripts/db-sync.ts ]; then
+    if [ -n "$DATABASE_URL" ]; then
+      <%= pm.exec %> tsx scripts/db-sync.ts
+    else
+      echo "<%= inst.display %>: skipping schema sync (DATABASE_URL not set)."
+    fi
+  fi
+<% } else { %>
+  if [ -f prisma/schema.prisma ] && [ -z "$(ls -A prisma/migrations 2>/dev/null | grep -v migration_lock.toml)" ]; then
+    if [ -n "$DATABASE_URL" ]; then
+      <%= pm.exec %> prisma migrate dev --name init --skip-seed
+    else
+      echo "<%= inst.display %>: skipping initial migration (DATABASE_URL not set)."
+    fi
+  fi
+<% } %>
+)
+if [ ! -f <%= inst.path %>/.env ] && [ -f <%= inst.path %>/.env.example ]; then
+  cp <%= inst.path %>/.env.example <%= inst.path %>/.env
+  echo "<%= inst.path %>/.env created from .env.example."
+fi
+echo "<%= inst.display %> dependencies installed."
+<% } %>
+<% for (const inst of expressInstances) { %>
+
+(
+  cd <%= inst.path %>
+  <%= pm.install %>
+<% if (orm === 'drizzle') { %>
+  if [ -f drizzle.config.ts ]; then
+    if [ -n "$DATABASE_URL" ]; then
+      <%= pm.exec %> drizzle-kit push --force
+    else
+      echo "<%= inst.display %>: skipping Drizzle schema push (DATABASE_URL not set)."
+    fi
+  fi
+<% } else if (orm === 'sequelize' || orm === 'typeorm') { %>
+  if [ -f scripts/db-sync.ts ]; then
+    if [ -n "$DATABASE_URL" ]; then
+      <%= pm.exec %> tsx scripts/db-sync.ts
+    else
+      echo "<%= inst.display %>: skipping schema sync (DATABASE_URL not set)."
+    fi
+  fi
+<% } else { %>
+  if [ -f prisma/schema.prisma ] && [ -z "$(ls -A prisma/migrations 2>/dev/null | grep -v migration_lock.toml)" ]; then
+    if [ -n "$DATABASE_URL" ]; then
+      <%= pm.exec %> prisma migrate dev --name init --skip-seed
+    else
+      echo "<%= inst.display %>: skipping initial migration (DATABASE_URL not set)."
+    fi
+  fi
+<% } %>
+)
+if [ ! -f <%= inst.path %>/.env ] && [ -f <%= inst.path %>/.env.example ]; then
+  cp <%= inst.path %>/.env.example <%= inst.path %>/.env
+  echo "<%= inst.path %>/.env created from .env.example."
+fi
 echo "<%= inst.display %> dependencies installed."
 <% } %>
 <% for (const inst of frontendInstances) { %>
 
-cd <%= inst.path %> && <%= pm.ci %> && cd ..
+(
+  cd <%= inst.path %>
+  <%= pm.install %>
+)
+if [ ! -f <%= inst.path %>/.env ] && [ -f <%= inst.path %>/.env.example ]; then
+  cp <%= inst.path %>/.env.example <%= inst.path %>/.env
+  echo "<%= inst.path %>/.env created from .env.example."
+fi
 echo "<%= inst.display %> dependencies installed."
 <% } %>
 <% for (const inst of e2eInstances) { %>
 
-cd <%= inst.path %> && <%= pm.ci %> && cd ..
+(
+  cd <%= inst.path %>
+  <%= pm.install %>
+)
 echo "<%= inst.display %> dependencies installed."
 <% } %>
 <% for (const inst of mobileInstances) { %>
 
 if command -v flutter &>/dev/null; then
-  cd <%= inst.path %> && flutter pub get && cd ..
+  (
+    cd <%= inst.path %>
+    flutter pub get
+  )
   echo "<%= inst.display %> dependencies installed."
 else
   echo "<%= inst.display %> skipped (SDK not installed)."
@@ -34,4 +123,4 @@ fi
 <% } %>
 
 echo ""
-echo "Done. Run 'docker compose -f docker-compose.dev.yml up' to start."
+echo "Done. Ensure PostgreSQL is running locally, then run '<%= pm.runDev %>' (or 'uv run main.py') in each service."

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

@@ -1,189 +0,0 @@
-services:
-<% if (fastapiInstances.length > 0 || fastifyInstances.length > 0) { %>
-  db:
-    image: postgres:16-alpine
-    environment:
-      POSTGRES_USER: dev
-      POSTGRES_PASSWORD: dev
-      POSTGRES_DB: app
-    ports:
-      - '5432:5432'
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U dev -d app']
-      interval: 5s
-      timeout: 3s
-      retries: 5
-    deploy:
-      resources:
-        limits:
-          memory: 256M
-          cpus: '0.5'
-    networks:
-      - app-network
-<% } %>
-<% 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
-    depends_on:
-      db:
-        condition: service_healthy
-    deploy:
-      resources:
-        limits:
-          memory: 256M
-          cpus: '0.5'
-    networks:
-      - app-network
-  <%= 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
-      - JWT_PROVIDER=shared_secret
-      - JWT_SECRET=dev-secret-that-is-at-least-32-bytes-long
-      - JWT_ALGORITHMS=HS256
-    volumes:
-      - ./<%= inst.path %>/src:/app/src
-      - ./<%= inst.path %>/alembic.ini:/app/alembic.ini
-      - ./<%= inst.path %>/migrate.py:/app/migrate.py
-    depends_on:
-      <%= inst.path %>-migrate:
-        condition: service_completed_successfully
-    restart: unless-stopped
-    healthcheck:
-      test:
-        [
-          'CMD', 'python', '-c',
-          "import urllib.request; urllib.request.urlopen('http://localhost:7860/api/health')",
-        ]
-      interval: 15s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
-    deploy:
-      resources:
-        limits:
-          memory: 512M
-          cpus: '1.0'
-    networks:
-      - app-network
-<% } %>
-<% 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
-    depends_on:
-      db:
-        condition: service_healthy
-    deploy:
-      resources:
-        limits:
-          memory: 256M
-          cpus: '0.5'
-    networks:
-      - app-network
-  <%= 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:
-      - ./<%= inst.path %>/src:/app/src
-    depends_on:
-      <%= inst.path %>-migrate:
-        condition: service_completed_successfully
-    restart: unless-stopped
-    healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', 'http://localhost:3000/api/health']
-      interval: 15s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
-    deploy:
-      resources:
-        limits:
-          memory: 512M
-          cpus: '1.0'
-    networks:
-      - app-network
-<% } %>
-<% 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:
-      - ./<%= inst.path %>/.env
-    volumes:
-      - ./<%= inst.path %>:/app
-      - <%= inst.upper.toLowerCase() %>_node_modules:/app/node_modules
-<% if (fastifyInstances.length > 0) { %>
-    depends_on:
-      <%= fastifyInstances[0].path %>:
-        condition: service_healthy
-<% } else if (fastapiInstances.length > 0) { %>
-    depends_on:
-      <%= fastapiInstances[0].path %>:
-        condition: service_healthy
-<% } %>
-    healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', 'http://localhost:5173/']
-      interval: 15s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
-    deploy:
-      resources:
-        limits:
-          memory: 512M
-          cpus: '1.0'
-    networks:
-      - app-network
-<% } %>
-volumes:
-<% if (fastapiInstances.length > 0 || fastifyInstances.length > 0) { %>
-  pgdata:
-<% } %>
-<% for (const inst of frontendInstances) { %>
-  <%= inst.upper.toLowerCase() %>_node_modules:
-<% } %>
-networks:
-  app-network:
-    driver: bridge