create-blitzpack 0.1.16 → 0.1.18

package/dist/index.js

@@ -229,7 +229,8 @@ var FEATURE_EXCLUSIONS = {
     "apps/api/.dockerignore",
     "apps/api/Dockerfile",
     "apps/web/Dockerfile",
-    "deploy/docker"
+    "deploy/docker",
+    ".github/workflows/docker-build.yml"
   ],
   ciCd: [".github/workflows/cd.yml"]
 };
@@ -555,7 +556,11 @@ import fs from "fs-extra";
 import { downloadTemplate } from "giget";
 import path2 from "path";
 var GITHUB_REPO = "github:CarboxyDev/blitzpack";
-var POST_DOWNLOAD_EXCLUDES = ["create-blitzpack", "apps/marketing"];
+var POST_DOWNLOAD_EXCLUDES = [
+  "create-blitzpack",
+  "apps/marketing",
+  "CONTRIBUTING.md"
+];
 function getFeatureExclusions(features) {
   const exclusions = [];
   for (const [key, enabled] of Object.entries(features)) {
@@ -796,6 +801,219 @@ The web app uses Better Auth for authentication with modern patterns:
 - \`logger.perf(message, metrics)\` - Performance metrics
 `;
 
+// src/ci-workflow-template.ts
+var CI_WORKFLOW_TEMPLATE = `name: CI
+
+on:
+  push:
+    branches: [main, development]
+  pull_request:
+    branches: [main, development]
+
+# Cancel in-progress runs when a new commit is pushed
+concurrency:
+  group: \${{ github.workflow }}-\${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # Fast checks that can run in parallel
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Run lint
+        run: pnpm run lint
+
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Run typecheck
+        run: pnpm run typecheck
+        env:
+          DATABASE_URL: postgresql://user:pass@localhost:5432/db
+
+  # @feature testing
+  # Tests and build run after lint/typecheck pass
+  test:
+    runs-on: ubuntu-latest
+    needs: [lint, typecheck]
+
+    # PostgreSQL service for integration tests
+    services:
+      postgres:
+        image: postgres:17-alpine
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: app_dev_test
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd "pg_isready -U postgres"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    env:
+      NODE_ENV: test
+      DATABASE_URL: postgresql://postgres:postgres@localhost:5432/app_dev
+      API_URL: http://localhost:8080
+      FRONTEND_URL: http://localhost:3000
+      PORT: 8080
+      LOG_LEVEL: minimal
+      COOKIE_SECRET: test-cookie-secret-for-ci
+      BETTER_AUTH_SECRET: test-secret-minimum-32-characters-long-for-ci
+      BETTER_AUTH_URL: http://localhost:8080
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma Client
+        run: cd apps/api && npx prisma generate
+
+      - name: Run tests
+        run: pnpm run test
+  # @endfeature
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [lint, typecheck]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma Client
+        run: pnpm --filter @repo/api db:generate
+        env:
+          DATABASE_URL: postgresql://user:pass@localhost:5432/db
+
+      - name: Setup Turborepo cache
+        uses: actions/cache@v4
+        with:
+          path: .turbo
+          key: \${{ runner.os }}-turbo-\${{ github.sha }}
+          restore-keys: |
+            \${{ runner.os }}-turbo-
+
+      - name: Build
+        run: pnpm run build
+        env:
+          NODE_ENV: production
+          API_URL: 'http://localhost:8080'
+          FRONTEND_URL: 'http://localhost:3000'
+          DATABASE_URL: 'postgresql://user:pass@localhost:5432/db'
+          PORT: '8080'
+          LOG_LEVEL: 'minimal'
+          COOKIE_SECRET: 'ci-test-secret-not-for-production'
+          BETTER_AUTH_SECRET: 'test-secret-minimum-32-characters-long-for-ci'
+          BETTER_AUTH_URL: 'http://localhost:8080'
+          NEXT_PUBLIC_API_URL: 'http://localhost:8080/api'
+
+`;
+
+// src/docker-ci-workflow-template.ts
+var DOCKER_CI_WORKFLOW_TEMPLATE = `name: Docker Build
+
+on:
+  pull_request:
+    branches: [main, development]
+  push:
+    branches: [main]
+
+# Cancel in-progress runs when a new commit is pushed
+concurrency:
+  group: \${{ github.workflow }}-\${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-api:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build API image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./apps/api/Dockerfile
+          push: false
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  build-web:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Web image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./apps/web/Dockerfile
+          push: false
+          build-args: |
+            NEXT_PUBLIC_API_URL=http://localhost:8080/api
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+`;
+
 // src/transform.ts
 var TESTING_SCRIPTS = [
   "test",
@@ -824,6 +1042,8 @@ var TESTING_FILE_PATTERNS = [
 ];
 var TS_CONFIG_FILE_PATTERN = /^tsconfig(?:\.[^.]+)?\.json$/;
 var AGENT_DOC_TARGETS = ["CLAUDE.md", "AGENTS.md"];
+var CI_WORKFLOW_RELATIVE_PATH = ".github/workflows/ci.yml";
+var DOCKER_CI_WORKFLOW_RELATIVE_PATH = ".github/workflows/docker-build.yml";
 var MARKER_FILES = [
   "apps/api/src/app.ts",
   "apps/api/src/plugins/services.ts",
@@ -835,10 +1055,10 @@ function stripFeatureBlocks(content, disabledFeatures) {
   let skipUntilEnd = false;
   for (const line of lines) {
     const featureStart = line.match(
-      /^\s*(?:\/\/|<!--)\s*@feature\s+(\w+)\s*(?:-->)?\s*$/
+      /^\s*(?:\/\/|#|<!--)\s*@feature\s+(\w+)\s*(?:-->)?\s*$/
     );
     const featureEnd = line.match(
-      /^\s*(?:\/\/|<!--)\s*@endfeature\s*(?:-->)?\s*$/
+      /^\s*(?:\/\/|#|<!--)\s*@endfeature\s*(?:-->)?\s*$/
     );
     if (featureStart) {
       const feature = featureStart[1];
@@ -1011,6 +1231,8 @@ async function applyFeatureTransforms(targetDir, features) {
   if (!features.testing) {
     await transformForNoTesting(targetDir);
   }
+  await transformCiWorkflow(targetDir, disabledFeatures);
+  await transformDockerCiWorkflow(targetDir, features);
   await transformAgentDocs(targetDir, disabledFeatures);
 }
 async function transformForNoTesting(targetDir) {
@@ -1177,6 +1399,25 @@ async function transformAgentDocs(targetDir, disabledFeatures) {
     await fs2.writeFile(filePath, fileContent, "utf-8");
   }
 }
+async function transformCiWorkflow(targetDir, disabledFeatures) {
+  const workflowPath = path3.join(targetDir, CI_WORKFLOW_RELATIVE_PATH);
+  await fs2.ensureDir(path3.dirname(workflowPath));
+  let content = stripFeatureBlocks(CI_WORKFLOW_TEMPLATE, disabledFeatures);
+  content = cleanEmptyLines(content).trimEnd() + "\n";
+  await fs2.writeFile(workflowPath, content, "utf-8");
+}
+async function transformDockerCiWorkflow(targetDir, features) {
+  const workflowPath = path3.join(targetDir, DOCKER_CI_WORKFLOW_RELATIVE_PATH);
+  if (!features.dockerDeploy) {
+    if (await fs2.pathExists(workflowPath)) {
+      await fs2.remove(workflowPath);
+    }
+    return;
+  }
+  await fs2.ensureDir(path3.dirname(workflowPath));
+  const content = DOCKER_CI_WORKFLOW_TEMPLATE.trimEnd() + "\n";
+  await fs2.writeFile(workflowPath, content, "utf-8");
+}
 
 // src/commands/create.ts
 var ENV_FILES = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blitzpack",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Create a new Blitzpack project - full-stack TypeScript monorepo with Next.js and Fastify",
   "type": "module",
   "bin": {