@launchframe/cli 1.0.0-beta.15 → 1.0.0-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@launchframe/cli",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.18",
   "description": "Production-ready B2B SaaS boilerplate with subscriptions, credits, and multi-tenancy",
   "main": "src/index.js",
   "bin": {

package/src/commands/deploy-build.js

@@ -0,0 +1,137 @@
+const chalk = require('chalk');
+const { exec } = require('child_process');
+const { promisify } = require('util');
+const ora = require('ora');
+const path = require('path');
+const { requireProject, getProjectConfig } = require('../utils/project-helpers');
+const { checkDockerRunning, loginToGHCR, buildFullAppImages, buildAndPushImage } = require('../utils/docker-helper');
+
+const execAsync = promisify(exec);
+
+/**
+ * Build, push, and deploy Docker images
+ * @param {string} [serviceName] - Optional specific service to build (e.g., 'backend', 'admin-portal')
+ */
+async function deployBuild(serviceName) {
+  requireProject();
+
+  const serviceLabel = serviceName ? `(${serviceName})` : '(all services)';
+  console.log(chalk.blue.bold(`\n🔨 LaunchFrame Build & Deploy ${serviceLabel}\n`));
+
+  const config = getProjectConfig();
+  const projectRoot = process.cwd();
+
+  // Validate deployment is configured
+  if (!config.deployConfigured || !config.deployment) {
+    console.log(chalk.red('❌ Error: Deployment not configured yet\n'));
+    console.log(chalk.gray('Run this command first:'));
+    console.log(chalk.white('  launchframe deploy:configure\n'));
+    process.exit(1);
+  }
+
+  const { vpsHost, vpsUser, vpsAppFolder, githubOrg } = config.deployment;
+  const { projectName, installedServices } = config;
+  const envProdPath = path.join(projectRoot, 'infrastructure', '.env.prod');
+
+  // Step 1: Check Docker is running
+  console.log(chalk.yellow('🐳 Step 1: Checking Docker...\n'));
+
+  const dockerSpinner = ora('Checking Docker...').start();
+
+  const dockerRunning = await checkDockerRunning();
+  if (!dockerRunning) {
+    dockerSpinner.fail('Docker is not running');
+    console.log(chalk.red('\n❌ Please start Docker and try again.\n'));
+    process.exit(1);
+  }
+
+  dockerSpinner.succeed('Docker is running');
+
+  // Step 2: Login to GHCR
+  console.log(chalk.yellow('\n🔐 Step 2: Logging in to GitHub Container Registry...\n'));
+
+  const ghcrToken = config.deployment.ghcrToken;
+  if (!ghcrToken) {
+    console.log(chalk.red('❌ Error: GHCR token not found in .launchframe config\n'));
+    console.log(chalk.gray('Run deploy:configure to set up your GitHub token.\n'));
+    process.exit(1);
+  }
+
+  try {
+    await loginToGHCR(githubOrg, ghcrToken);
+  } catch (error) {
+    console.log(chalk.red(`\n❌ ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Step 3: Build and push images
+  console.log(chalk.yellow('\n📦 Step 3: Building and pushing images...\n'));
+
+  try {
+    if (serviceName) {
+      // Build specific service
+      if (!installedServices.includes(serviceName)) {
+        console.log(chalk.red(`❌ Service "${serviceName}" not found in installed services.\n`));
+        console.log(chalk.gray(`Available services: ${installedServices.join(', ')}\n`));
+        process.exit(1);
+      }
+
+      const registry = `ghcr.io/${githubOrg}`;
+      await buildAndPushImage(
+        serviceName,
+        path.join(projectRoot, serviceName),
+        registry,
+        projectName
+      );
+      console.log(chalk.green.bold(`\n✅ ${serviceName} built and pushed to GHCR!\n`));
+    } else {
+      // Build all services
+      await buildFullAppImages(projectRoot, projectName, githubOrg, envProdPath, installedServices);
+      console.log(chalk.green.bold('\n✅ All images built and pushed to GHCR!\n'));
+    }
+  } catch (error) {
+    console.log(chalk.red(`\n❌ Build failed: ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Step 4: Pull images on VPS
+  console.log(chalk.yellow('\n🚀 Step 4: Pulling images on VPS...\n'));
+
+  const pullSpinner = ora('Pulling images on VPS...').start();
+
+  try {
+    await execAsync(
+      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull"`,
+      { timeout: 600000 } // 10 minutes
+    );
+    pullSpinner.succeed('Images pulled on VPS');
+  } catch (error) {
+    pullSpinner.fail('Failed to pull images');
+    console.log(chalk.red(`\n❌ Error: ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Step 5: Restart services
+  console.log(chalk.yellow('\n🔄 Step 5: Restarting services...\n'));
+
+  const restartSpinner = ora('Restarting services...').start();
+
+  try {
+    await execAsync(
+      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d"`,
+      { timeout: 300000 } // 5 minutes
+    );
+    restartSpinner.succeed('Services restarted');
+  } catch (error) {
+    restartSpinner.fail('Failed to restart services');
+    console.log(chalk.red(`\n❌ Error: ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Success!
+  console.log(chalk.green.bold('\n✅ Build and deploy complete!\n'));
+
+  console.log(chalk.gray('Your updated application is now running.\n'));
+}
+
+module.exports = { deployBuild };

package/src/commands/deploy-set-env.js

@@ -164,6 +164,7 @@ async function deploySetEnv() {
   if (config.deployment?.primaryDomain) {
     const domain = config.deployment.primaryDomain;
     const urlReplacements = {
+      'PRIMARY_DOMAIN': domain,
       'API_BASE_URL': `https://api.${domain}`,
       'ADMIN_BASE_URL': `https://admin.${domain}`,
       'FRONTEND_BASE_URL': `https://app.${domain}`,

package/src/commands/deploy-up.js

@@ -106,7 +106,7 @@ async function deployUp() {
 
   try {
     const { stdout: psOutput } = await execAsync(
-      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml ps"`,
+      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml ps"`,
       { timeout: 30000 }
     );
 
@@ -139,7 +139,7 @@ async function deployUp() {
   console.log(chalk.gray('   Just push to GitHub - CI/CD will handle deployment automatically!\n'));
 
   console.log(chalk.white('3. Monitor services:'));
-  console.log(chalk.gray(`   Run: ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose logs -f"\n`));
+  console.log(chalk.gray(`   Run: ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml logs -f"\n`));
 }
 
 module.exports = { deployUp };

package/src/commands/help.js

@@ -18,7 +18,8 @@ function help() {
     console.log(chalk.gray('  deploy:configure  Configure production deployment settings'));
     console.log(chalk.gray('  deploy:set-env    Configure production environment variables'));
     console.log(chalk.gray('  deploy:init       Initialize VPS and build Docker images'));
-    console.log(chalk.gray('  deploy:up         Start services on VPS\n'));
+    console.log(chalk.gray('  deploy:up         Start services on VPS'));
+    console.log(chalk.gray('  deploy:build [service]  Build, push, and deploy (all or specific service)\n'));
 
     // Conditionally show waitlist commands
     if (isWaitlistInstalled()) {

package/src/index.js

@@ -10,6 +10,7 @@ const { deployConfigure } = require('./commands/deploy-configure');
 const { deploySetEnv } = require('./commands/deploy-set-env');
 const { deployInit } = require('./commands/deploy-init');
 const { deployUp } = require('./commands/deploy-up');
+const { deployBuild } = require('./commands/deploy-build');
 const { waitlistDeploy } = require('./commands/waitlist-deploy');
 const { waitlistUp } = require('./commands/waitlist-up');
 const { waitlistDown } = require('./commands/waitlist-down');
@@ -98,6 +99,9 @@ async function main() {
     case 'deploy:up':
       await deployUp();
       break;
+    case 'deploy:build':
+      await deployBuild(args[1]); // Optional service name
+      break;
     case 'waitlist:deploy':
       await waitlistDeploy();
       break;

package/src/services/variant-config.js

@@ -21,7 +21,6 @@ const VARIANT_CONFIG = {
         // Complete files/folders to copy
         files: [
           'src/modules/domain/projects',           // Entire projects module
-          'src/modules/domain/ai/services/project-config.service.ts', // Project config service
           'src/guards/project-ownership.guard.ts', // Project ownership guard (header-based)
           'src/guards/project-param.guard.ts',     // Project param guard (route-based)
           'src/modules/users/users.service.ts',    // Users service with multi-tenant support
@@ -30,13 +29,8 @@ const VARIANT_CONFIG = {
         ],
 
         // Code sections to insert into base template files
+        // Note: main.ts uses PRIMARY_DOMAIN env var for dynamic CORS - no sections needed
         sections: {
-          'src/main.ts': [
-            'PROJECT_IMPORTS',              // Add project-related imports
-            'PROJECT_CUSTOM_DOMAINS',       // Add custom domains query
-            'PROJECT_CUSTOM_DOMAINS_CORS',  // Add custom domains to CORS
-            'PROJECT_GUARD'                 // Add ProjectOwnershipGuard registration
-          ],
           'src/modules/app/app.module.ts': [
             'PROJECTS_MODULE_IMPORT',       // Add ProjectsModule import
             'PROJECTS_MODULE'               // Add ProjectsModule to imports array

package/src/utils/docker-helper.js

@@ -254,6 +254,7 @@ async function buildWaitlistImage(projectRoot, projectName, githubOrg) {
 module.exports = {
   checkDockerRunning,
   loginToGHCR,
+  buildAndPushImage,
   buildFullAppImages,
   buildWaitlistImage
 };

package/src/utils/variant-processor.js

@@ -62,7 +62,9 @@ async function processServiceVariant(
     const variantConfig = serviceConfig.variants[variantName];
 
     if (!variantConfig) {
-      logger.warn(`No configuration found for variant: ${variantName}, skipping`);
+      // Silently skip - not every service needs every variant combination
+      // (e.g., b2b2c_multi-tenant may only apply to backend, not admin-portal)
+      logger.detail(`Skipping ${variantName} (not applicable to this service)`, 3);
       continue;
     }