deploy-stack 0.3.2 → 0.4.0

package/README.md

@@ -4,7 +4,7 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-![deploy-stack CLI demonstration](./docs/demo.gif)
+<!-- ![deploy-stack CLI demonstration](./docs/demo.gif) -->
 
 ---
 
@@ -25,7 +25,8 @@ You retain complete ownership of your infrastructure code without relying on bla
 ## ✨ Features
 
 * **Zero Vendor Lock-In:** Generates standard, clean `.tf` files. Modify, expand, or decouple them at any time.
-* **Framework Agnostic:** Tailored container presets for Next.js (standalone), Express.js, FastAPI, and custom Docker setups.
+* **Framework Agnostic:** Tailored container presets for Next.js, Express.js, FastAPI, and **Zero-Config Static Sites** (React, Vue, SvelteKit, Astro, Vite).
+* **Smart Git Integration:** Automatically detects your working branch (`main`, `master`, `develop`) and binds it directly to the generated GitHub Actions pipeline.
 * **Production-Grade Defaults:** Automatically provisions an Amazon ECS Fargate cluster fronted by an Application Load Balancer across multiple availability zones.
 * **Global Edge Acceleration:** Includes an integrated AWS CloudFront CDN distribution with SSL termination and optimized caching.
 * **Keyless, Zero-Secret CI/CD:** Uses AWS IAM OpenID Connect (OIDC) for automated GitHub Actions deployments—no long-lived AWS keys stored in GitHub Secrets.
@@ -46,7 +47,7 @@ npx deploy-stack
 The interactive CLI will guide you through the setup:
 1. **Target Directory / Name:** (Type `.` to bootstrap your current directory)
 2. **Setup Mode:** (Choose **Quickstart** for sensible defaults, or **Advanced** for custom scaling and branch names)
-3. **Zero-Config Detection:** The CLI automatically scans your `package.json` or `requirements.txt` to detect your framework (Next.js, Express, FastAPI, etc.) and dynamically configures your container port.
+3. **Zero-Config Detection:** The CLI automatically scans your project to detect your framework. For static sites, it intelligently discovers your build output directory (`dist`, `build`, `.output`, etc.) and dynamically configures the hardened Nginx container.
 4. **AWS Region & Compute Tier:** (Select your target region and Fargate size with live cost estimates)
 
 ---
@@ -104,8 +105,13 @@ your-project/
 
 ## 📦 Reference Implementations
 
-* **[Next.js Fullstack Reference App](https://github.com/anton-codes-iac/deploy-stack-nextjs-example):** A complete Next.js deployment showcasing the generated Terraform, CloudFront setup, and automated OIDC workflow.
-
+* **[Next.js Fullstack App](https://github.com/anton-codes-iac/deploy-stack-nextjs-example):** A complete Next.js deployment showcasing the generated Terraform, CloudFront setup, and automated OIDC workflow.
+* **[Express.js API](https://github.com/anton-codes-iac/deploy-stack-express-example):** A standard Node.js backend setup.
+* **[Python FastAPI](https://github.com/anton-codes-iac/deploy-stack-fastapi-example):** A Python API demonstrating unprivileged port mapping.
+* **[Vite / React SPA](https://github.com/anton-codes-iac/deploy-stack-vite-example):** Demonstrates SPA routing and `dist/` auto-detection.
+* **[Create React App](https://github.com/anton-codes-iac/deploy-stack-cra-example):** Validates backward compatibility with legacy Webpack pipelines and `build/` auto-detection.
+* **[Astro Static Site](https://github.com/anton-codes-iac/deploy-stack-astro-example):** Demonstrates modern static site generation (SSG).
+* **[SvelteKit Application](https://github.com/anton-codes-iac/deploy-stack-svelte-example):** Demonstrates static adapter integration and custom output folder detection.
 ---
 
 ## 🛡️ Telemetry & Privacy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deploy-stack",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Provision production-ready AWS infrastructure and CI/CD pipelines in seconds.",
   "type": "module",
   "bin": {

package/src/commands/init.js

@@ -3,6 +3,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { intro, outro, group, text, select, spinner, cancel, confirm, log } from '@clack/prompts';
 import color from 'picocolors';
+import { execSync } from 'child_process';
 
 import { checkDependency } from '../utils/system.js';
 import { detectFramework } from '../utils/detector.js';
@@ -88,6 +89,14 @@ export async function mainStack() {
     if (finalFramework === 'static') defaultPort = '8080';
     if (finalFramework === 'python') defaultPort = '8000';
 
+    // 2.8 Check current Git branch
+    let currentGitBranch = 'main';
+    try {
+        currentGitBranch = execSync('git symbolic-ref --short HEAD', { cwd: targetDir, stdio: 'pipe' }).toString().trim();
+    } catch (e) {
+        // Not a git repo yet, fallback to 'main'
+    }
+
     // 3. Prompt Configuration Group
     const project = await group(
         {
@@ -140,8 +149,8 @@ export async function mainStack() {
                 if (setupType === 'quick') return undefined;
                 return text({
                     message: 'Primary Git deployment branch for CI/CD:',
-                    placeholder: 'main',
-                    defaultValue: 'main',
+                    placeholder: currentGitBranch,
+                    defaultValue: currentGitBranch,
                 });
             },
         },
@@ -162,7 +171,9 @@ export async function mainStack() {
 
     const healthCheckPath = project.healthCheckPath || '/';
     const desiredCount = project.desiredCount || '1';
-    const deployBranch = project.branch || 'main';
+    const deployBranch = project.branch || currentGitBranch;
+
+    const buildDir = detectedFramework?.buildDir || 'dist';
 
     // 5. Check for existing files that might be overwritten
     const dockerfilePath = path.join(targetDir, 'Dockerfile');
@@ -213,6 +224,7 @@ export async function mainStack() {
         HEALTH_CHECK_PATH: healthCheckPath,
         DESIRED_COUNT: desiredCount,
         DEPLOY_BRANCH: deployBranch,
+        BUILD_DIR: buildDir,
         finalFramework: finalFramework
     });
 
@@ -230,7 +242,10 @@ export async function mainStack() {
     s.stop('Infrastructure provisioned successfully!');
 
     // 9. Provide the Outro, Framework Warnings and Next Steps
-    const frameworkWarnings = getFrameworkWarning(finalFramework);
+    let frameworkWarnings = '';
+    if (!(finalFramework === 'static' && detectedFramework?.buildDir)) {
+        frameworkWarnings = getFrameworkWarning(finalFramework);
+    }
 
     const isGitInitialized = fsSync.existsSync(path.join(targetDir, '.git'));
 
@@ -240,7 +255,7 @@ export async function mainStack() {
 
     const gitInstructions = isGitInitialized
         ? `git add .\n       git commit -m "chore: add AWS infrastructure and CI/CD"\n       git push`
-        : `git init\n       git add .\n       git commit -m "chore: add AWS infrastructure and CI/CD"\n       git branch -M main\n       git remote add origin https://github.com/your-username/your-repo.git\n       git push -u origin main`;
+        : `git init\n       git add .\n       git commit -m "chore: add AWS infrastructure and CI/CD"\n       git branch -M ${deployBranch}\n       git remote add origin https://github.com/your-username/your-repo.git\n       git push -u origin ${deployBranch}`;
 
     outro(`
     ${color.green('✅ Project provisioned successfully!')}

package/src/utils/detector.js

@@ -12,9 +12,19 @@ export function detectFramework(targetDir) {
             // Merge dependencies and devDependencies to check both
             const deps = { ...(pkg.dependencies || {}), ...(pkg.devDependencies || {}) };
 
+            // Next.js & Express
             if (deps['next']) return { id: 'nextjs', name: 'Next.js' };
-            if (deps['vite'] || deps['astro'] || deps['@sveltejs/kit'] || deps['gatsby'] || deps['react-scripts'] || deps['@vue/cli-service']) return { id: 'static', name: 'Static Site (Vite, Astro, React)' };
             if (deps['express']) return { id: 'node', name: 'Node.js / Express' };
+
+            // Static Site Generators & SPAs (with precise build directories)
+            if (deps['@sveltejs/kit']) return { id: 'static', name: 'SvelteKit', buildDir: 'build' };
+            if (deps['react-scripts']) return { id: 'static', name: 'Create React App', buildDir: 'build' };
+            if (deps['gatsby']) return { id: 'static', name: 'Gatsby', buildDir: 'public' };
+            if (deps['nuxt']) return { id: 'static', name: 'Nuxt', buildDir: '.output/public' };
+            if (deps['astro']) return { id: 'static', name: 'Astro', buildDir: 'dist' };
+            if (deps['vite']) return { id: 'static', name: 'Vite', buildDir: 'dist' };
+            if (deps['@vue/cli-service']) return { id: 'static', name: 'Vue.js', buildDir: 'dist' };
+            if (deps['@angular/cli']) return { id: 'static', name: 'Angular', buildDir: 'dist' };
         } catch (e) {
             // Silently fail if package.json is malformed
         }

package/src/utils/generator.js

@@ -103,6 +103,8 @@ env/
 node_modules/
 dist/
 build/
+out/
+.output/
 .cache/
 public/
 `;

package/src/utils/warnings.js

@@ -25,10 +25,9 @@ export function getFrameworkWarning(frameworkId) {
             return (
                 color.bgYellow(color.black(' ⚠️  IMPORTANT: STATIC SITE SETUP REQUIRED ')) +
                 color.yellow('\n    1. Open your generated Dockerfile.') +
-                color.yellow('\n    2. Ensure the "COPY --from=builder" command matches your framework:') +
-                color.yellow('\n       Vite / Astro:   COPY --from=builder /app/dist /usr/share/nginx/html') +
-                color.yellow('\n       Create React App: COPY --from=builder /app/build /usr/share/nginx/html') +
-                color.yellow('\n    3. Ensure your package.json has a "build" script (e.g., "vite build").\n\n')
+                color.yellow('\n    2. We defaulted your output folder to /app/dist.') +
+                color.yellow('\n    3. If your framework uses a different folder (like build/ or out/), change it in the COPY command.') +
+                color.yellow('\n    4. Ensure your package.json has a "build" script (e.g., "vite build").\n\n')
             );
         default:
             return '';

package/templates/docker/nextjs.Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Install dependencies and build the app
-FROM node:20-alpine AS builder
+FROM node:22-alpine AS builder
 WORKDIR /app
 
 # Copy package files and install dependencies
@@ -14,7 +14,7 @@ COPY . .
 RUN npm run build
 
 # Stage 2: Production environment
-FROM node:20-alpine AS runner
+FROM node:22-alpine AS runner
 WORKDIR /app
 
 ENV NODE_ENV=production

package/templates/docker/node.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:22-alpine
 
 # 1. Set production environment (optimizes Node and prevents dev dependencies)
 ENV NODE_ENV=production

package/templates/docker/static.Dockerfile

@@ -1,5 +1,5 @@
 # STAGE 1: Build the static assets
-FROM node:20-alpine AS builder
+FROM node:22-alpine AS builder
 WORKDIR /app
 
 COPY package*.json ./
@@ -13,9 +13,8 @@ RUN npm run build
 # STAGE 2: Serve with Hardened Nginx
 FROM nginx:alpine
 
-# ⚠️ CRITICAL: Adjust 'dist' to match your framework's output folder!
-# Vite/Astro = dist | Create React App/Gatsby = build | Next.js Static = out
-COPY --from=builder /app/dist /usr/share/nginx/html
+# Adjusts BUILD_DIR to match your framework's output folder
+COPY --from=builder /app/{{BUILD_DIR}} /usr/share/nginx/html
 
 # Inject custom Nginx configuration for unprivileged ports and SPA routing
 RUN echo "server {" > /etc/nginx/conf.d/default.conf && \