cistack 3.0.1 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cistack",
-  "version": "3.0.1",
+  "version": "3.2.0",
   "description": "Automatically generate GitHub Actions CI/CD pipelines by analysing your codebase",
   "main": "src/index.js",
   "bin": {

package/src/generators/workflow.js

@@ -280,6 +280,7 @@ class WorkflowGenerator {
     const h = this.primaryHosting;
     const lang = this.primaryLang;
     const branches = this.extraConfig.branches || ['main', 'master'];
+    const isGHPages = h.name === 'GitHub Pages';
 
     const preDeploySteps = [
       this._stepCheckout(),
@@ -288,14 +289,21 @@ class WorkflowGenerator {
     ].filter(Boolean);
 
     const deploySteps = this._hostingDeploySteps(h, lang, false); // production
-    const previewSteps = this._hostingDeploySteps(h, lang, true);  // preview
+    // GitHub Pages has no PR preview concept — skip preview job for it
+    const previewSteps = isGHPages ? [] : this._hostingDeploySteps(h, lang, true);
+
+    // GitHub Pages requires special permissions on the deploy job
+    const ghPagesPermissions = isGHPages
+      ? { pages: 'write', 'id-token': 'write', contents: 'read' }
+      : undefined;
 
     const jobs = {
       deploy: {
         name: `🚀 Deploy → ${h.name} (Production)`,
         if: "github.event_name == 'push' || github.event_name == 'workflow_dispatch'",
         'runs-on': 'ubuntu-latest',
-        environment: 'production',
+        environment: isGHPages ? 'github-pages' : 'production',
+        ...(ghPagesPermissions ? { permissions: ghPagesPermissions } : {}),
         steps: [...preDeploySteps, ...deploySteps].filter(Boolean),
       },
     };
@@ -323,13 +331,14 @@ class WorkflowGenerator {
 
     const envComment = this._envComment();
 
+    // GitHub Pages doesn't need pull_request trigger (no preview)
+    const onTrigger = isGHPages
+      ? { push: { branches: branches.filter((b) => b !== 'develop') }, workflow_dispatch: {} }
+      : { push: { branches: branches.filter((b) => b !== 'develop') }, pull_request: { branches }, workflow_dispatch: {} };
+
     const workflow = {
       name: `Deploy to ${h.name}`,
-      on: {
-        push: { branches: branches.filter((b) => b !== 'develop') },
-        pull_request: { branches },
-        workflow_dispatch: {},
-      },
+      on: onTrigger,
       jobs,
     };
 
@@ -739,11 +748,28 @@ class WorkflowGenerator {
 
       case 'Vercel': {
         const prodFlag = isPreview ? '' : '--prod';
+        const vercelEnv = {
+          VERCEL_TOKEN:      '${{ secrets.VERCEL_TOKEN }}',
+          VERCEL_ORG_ID:     '${{ secrets.VERCEL_ORG_ID }}',
+          VERCEL_PROJECT_ID: '${{ secrets.VERCEL_PROJECT_ID }}',
+        };
         steps.push(
           { name: 'Install Vercel CLI', run: 'npm install -g vercel' },
-          { name: 'Pull Vercel environment', run: `vercel pull --yes --environment=${isPreview ? 'preview' : 'production'} --token=\${{ secrets.VERCEL_TOKEN }}` },
-          { name: 'Build project', run: `vercel build ${prodFlag} --token=\${{ secrets.VERCEL_TOKEN }}` },
-          { name: 'Deploy to Vercel', run: `vercel deploy --prebuilt ${prodFlag} --token=\${{ secrets.VERCEL_TOKEN }}` },
+          {
+            name: 'Pull Vercel environment',
+            run: `vercel pull --yes --environment=${isPreview ? 'preview' : 'production'} --token=\${{ secrets.VERCEL_TOKEN }}`,
+            env: vercelEnv,
+          },
+          {
+            name: 'Build project',
+            run: `vercel build${prodFlag ? ' ' + prodFlag : ''} --token=\${{ secrets.VERCEL_TOKEN }}`,
+            env: vercelEnv,
+          },
+          {
+            name: 'Deploy to Vercel',
+            run: `vercel deploy --prebuilt${prodFlag ? ' ' + prodFlag : ''} --token=\${{ secrets.VERCEL_TOKEN }}`,
+            env: vercelEnv,
+          },
         );
         break;
       }
@@ -832,7 +858,10 @@ class WorkflowGenerator {
       }
 
       case 'Render': {
-        steps.push({ name: 'Trigger Render deploy', run: 'curl -X POST ${{ secrets.RENDER_DEPLOY_HOOK_URL }}' });
+        // Render doesn't support PR preview deploys via deploy hook
+        if (!isPreview) {
+          steps.push({ name: 'Trigger Render deploy', run: 'curl -X POST "${{ secrets.RENDER_DEPLOY_HOOK_URL }}"' });
+        }
         break;
       }
 

package/src/index.js

@@ -257,20 +257,72 @@ class CIFlow {
     if (!confirmed) {
       console.log(chalk.yellow('\nCustomisation mode – answer the prompts below:\n'));
 
-      const hostingChoices = ['firebase', 'vercel', 'netlify', 'aws', 'gcp', 'azure', 'heroku', 'render', 'railway', 'none'];
+      // Map lowercase choice values → exact names used in _hostingDeploySteps() switch cases
+      const HOSTING_NAME_MAP = {
+        firebase:      'Firebase',
+        vercel:        'Vercel',
+        netlify:       'Netlify',
+        aws:           'AWS',
+        gcp:           'GCP App Engine',
+        azure:         'Azure',
+        heroku:        'Heroku',
+        render:        'Render',
+        railway:       'Railway',
+        'github-pages':'GitHub Pages',
+      };
+
+      const hostingChoices = [
+        { name: 'Firebase',      value: 'firebase' },
+        { name: 'Vercel',        value: 'vercel' },
+        { name: 'Netlify',       value: 'netlify' },
+        { name: 'AWS (S3 + CloudFront)', value: 'aws' },
+        { name: 'GCP App Engine',value: 'gcp' },
+        { name: 'Azure Web App', value: 'azure' },
+        { name: 'Heroku',        value: 'heroku' },
+        { name: 'Render',        value: 'render' },
+        { name: 'Railway',       value: 'railway' },
+        { name: 'GitHub Pages',  value: 'github-pages' },
+        { name: 'None',          value: 'none' },
+      ];
+
+      // Pre-select whatever was already detected (match by canonical name)
+      const reverseMap = Object.fromEntries(
+        Object.entries(HOSTING_NAME_MAP).map(([k, v]) => [v.toLowerCase(), k])
+      );
+      const currentDefaults = config.hosting
+        .map((h) => reverseMap[h.name.toLowerCase()])
+        .filter(Boolean);
+
       const { customHosting } = await inquirer.prompt([
         {
           type: 'checkbox',
           name: 'customHosting',
           message: 'Select hosting platform(s):',
           choices: hostingChoices,
-          default: config.hosting.map((h) => h.name.toLowerCase()),
+          default: currentDefaults,
         },
       ]);
 
       config.hosting = customHosting
         .filter((h) => h !== 'none')
-        .map((h) => ({ name: h, confidence: 1.0, manual: true, secrets: [] }));
+        .map((h) => ({
+          name:       HOSTING_NAME_MAP[h] || h,   // always the correct PascalCase name
+          confidence: 1.0,
+          manual:     true,
+          // Populate secrets so the generated deploy.yml header lists them correctly
+          secrets: {
+            firebase:       ['FIREBASE_SERVICE_ACCOUNT'],
+            vercel:         ['VERCEL_TOKEN', 'VERCEL_ORG_ID', 'VERCEL_PROJECT_ID'],
+            netlify:        ['NETLIFY_AUTH_TOKEN', 'NETLIFY_SITE_ID'],
+            aws:            ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AWS_REGION', 'AWS_S3_BUCKET', 'CLOUDFRONT_DISTRIBUTION_ID'],
+            gcp:            ['GCP_SA_KEY'],
+            azure:          ['AZURE_APP_NAME', 'AZURE_WEBAPP_PUBLISH_PROFILE'],
+            heroku:         ['HEROKU_API_KEY', 'HEROKU_APP_NAME', 'HEROKU_EMAIL'],
+            render:         ['RENDER_DEPLOY_HOOK_URL'],
+            railway:        ['RAILWAY_TOKEN'],
+            'github-pages': [],
+          }[h] || [],
+        }));
     }
 
     return config;