@panoptic-it-solutions/coolify-setup 1.1.2 → 1.1.4

package/dist/generator.js

@@ -25,28 +25,22 @@ function addEsbuildToPackageJson(packageManager) {
         if (!packageJson.devDependencies) {
             packageJson.devDependencies = {};
         }
+        let addedEsbuild = false;
         // Add esbuild if not already present
         if (!packageJson.devDependencies.esbuild) {
             packageJson.devDependencies.esbuild = '^0.25.0';
             writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf-8');
-            // Update the lockfile so Docker build works with frozen-lockfile
-            const installCmd = packageManager === 'pnpm'
-                ? 'pnpm install'
-                : packageManager === 'yarn'
-                    ? 'yarn install'
-                    : 'npm install';
-            console.log(`Running ${installCmd} to update lockfile...`);
-            execSync(installCmd, { stdio: 'inherit', cwd: process.cwd() });
-            // Remind user to commit the lockfile
-            const lockfileName = packageManager === 'pnpm'
-                ? 'pnpm-lock.yaml'
-                : packageManager === 'yarn'
-                    ? 'yarn.lock'
-                    : 'package-lock.json';
-            console.log(`\n⚠️  IMPORTANT: Commit ${lockfileName} before pushing to avoid CI build failures!\n`);
-            return true;
+            addedEsbuild = true;
         }
-        return false;
+        // Always run install to ensure lockfile is in sync
+        const installCmd = packageManager === 'pnpm'
+            ? 'pnpm install'
+            : packageManager === 'yarn'
+                ? 'yarn install'
+                : 'npm install';
+        console.log(`Running ${installCmd} to ensure lockfile is in sync...`);
+        execSync(installCmd, { stdio: 'inherit', cwd: process.cwd() });
+        return addedEsbuild;
     }
     catch (error) {
         console.log('Warning: Failed to update package.json:', error);

package/dist/git.d.ts

@@ -8,4 +8,11 @@ export interface GitHubSetupResult {
     existingRemote: string | null;
     warnings: string[];
 }
+export interface CommitAndPushResult {
+    committed: boolean;
+    pushed: boolean;
+    branchName: string;
+    warnings: string[];
+}
+export declare function commitAndPushToDevelop(files: string[]): Promise<CommitAndPushResult>;
 export declare function setupGitHub(projectName: string): Promise<GitHubSetupResult>;

package/dist/git.js

@@ -33,6 +33,81 @@ function isCorrectRemote(remoteUrl, projectName) {
     ];
     return expectedPatterns.some(pattern => remoteUrl.includes(pattern));
 }
+export async function commitAndPushToDevelop(files) {
+    const result = {
+        committed: false,
+        pushed: false,
+        branchName: 'develop',
+        warnings: [],
+    };
+    // Initialize git if not already a repo
+    if (!isGitRepo()) {
+        run('git init');
+    }
+    // Stage all specified files
+    for (const file of files) {
+        try {
+            run(`git add "${file}"`);
+        }
+        catch {
+            // File might not exist, that's ok
+        }
+    }
+    // Check if there are staged changes
+    try {
+        const status = run('git diff --cached --name-only');
+        if (!status) {
+            result.warnings.push('No changes to commit');
+            return result;
+        }
+    }
+    catch {
+        result.warnings.push('Failed to check git status');
+        return result;
+    }
+    // Commit the changes
+    try {
+        run('git commit -m "chore: add Coolify deployment configuration"');
+        result.committed = true;
+    }
+    catch (error) {
+        result.warnings.push(`Failed to commit: ${error}`);
+        return result;
+    }
+    // Check if remote exists
+    const remoteUrl = getGitRemoteUrl();
+    if (!remoteUrl) {
+        result.warnings.push('No remote configured - files committed locally but not pushed');
+        return result;
+    }
+    // Ensure develop branch exists and push to it
+    try {
+        const currentBranch = run('git branch --show-current');
+        if (currentBranch === 'develop') {
+            // Already on develop, just push
+            run('git push origin develop');
+        }
+        else {
+            // Check if develop exists remotely
+            try {
+                run('git fetch origin develop');
+                // Develop exists, checkout and merge/rebase current changes
+                run('git checkout develop');
+                run(`git merge ${currentBranch} --no-edit`);
+                run('git push origin develop');
+            }
+            catch {
+                // Develop doesn't exist remotely, create it from current branch
+                run('git push origin HEAD:develop');
+            }
+        }
+        result.pushed = true;
+    }
+    catch (error) {
+        result.warnings.push(`Failed to push to develop: ${error}`);
+    }
+    return result;
+}
 export async function setupGitHub(projectName) {
     const result = {
         repoCreated: false,
@@ -75,17 +150,9 @@ export async function setupGitHub(projectName) {
             // Don't proceed with operations that would push to the wrong repo
             return result;
         }
-        // Remote exists and is correct, just push
-        try {
-            run('git push origin HEAD');
-            result.repoPushed = true;
-        }
-        catch (error) {
-            result.warnings.push(`Failed to push to existing remote: ${error}`);
-        }
     }
     else {
-        // Create the repository
+        // Create the repository (pushes current branch)
         try {
             await runAsync(`gh repo create ${ORG}/${projectName} --private --source=. --push`);
             result.repoCreated = true;
@@ -95,35 +162,57 @@ export async function setupGitHub(projectName) {
             throw new Error(`Failed to create repository: ${error}`);
         }
     }
-    // Ensure we're on main and push
-    const currentBranch = run('git branch --show-current');
-    if (currentBranch !== 'main') {
-        run('git checkout -b main 2>/dev/null || git checkout main');
-    }
-    // Push main
+    // Ensure we're on develop branch and push to it
     try {
-        run('git push origin main');
-        result.mainBranchPushed = true;
+        const currentBranch = run('git branch --show-current');
+        if (currentBranch !== 'develop') {
+            // Check if develop exists locally
+            try {
+                run('git checkout develop');
+            }
+            catch {
+                // Create develop from current branch
+                run('git checkout -b develop');
+            }
+        }
+        run('git push origin develop -u');
+        result.developBranchCreated = true;
+        result.repoPushed = true;
     }
     catch {
-        result.warnings.push('Failed to push main branch (may already exist)');
+        result.warnings.push('Failed to push develop branch');
     }
-    // Create staging branch from main
+    // Create main branch from develop if it doesn't exist
     try {
-        run('git push origin main:staging');
-        result.stagingBranchCreated = true;
+        // Check if main exists remotely
+        run('git ls-remote --exit-code --heads origin main');
+        result.mainBranchPushed = true; // Already exists
     }
     catch {
-        result.warnings.push('Failed to create staging branch (may already exist)');
+        // Main doesn't exist, create it from develop
+        try {
+            run('git push origin develop:main');
+            result.mainBranchPushed = true;
+        }
+        catch {
+            result.warnings.push('Failed to create main branch');
+        }
     }
-    // Create and checkout develop branch
+    // Create staging branch from develop if it doesn't exist
     try {
-        run('git checkout -b develop 2>/dev/null || git checkout develop');
-        run('git push origin develop -u');
-        result.developBranchCreated = true;
+        // Check if staging exists remotely
+        run('git ls-remote --exit-code --heads origin staging');
+        result.stagingBranchCreated = true; // Already exists
     }
     catch {
-        result.warnings.push('Failed to create develop branch (may already exist)');
+        // Staging doesn't exist, create it from develop
+        try {
+            run('git push origin develop:staging');
+            result.stagingBranchCreated = true;
+        }
+        catch {
+            result.warnings.push('Failed to create staging branch');
+        }
     }
     // Set develop as default branch
     try {

package/dist/index.js

@@ -4,7 +4,7 @@ import ora from 'ora';
 import prompts from 'prompts';
 import { detectProject } from './detector.js';
 import { generateFiles } from './generator.js';
-import { setupGitHub } from './git.js';
+import { setupGitHub, commitAndPushToDevelop } from './git.js';
 async function main() {
     console.log(chalk.bold.cyan('\n🚀 Panoptic Coolify Setup\n'));
     // Detect project type
@@ -65,6 +65,36 @@ async function main() {
         includeRedis: response.includeRedis,
         includeMinio: response.includeMinio,
     });
+    // Track generated files for commit
+    const generatedFiles = [
+        'Dockerfile',
+        'docker-compose.yml',
+        'docker-compose.build.yml',
+        '.github/workflows/build-deploy.yml',
+        '.claude/rules/coolify.md',
+        'entrypoint.sh',
+        'package.json', // May be modified with esbuild
+    ];
+    // Add lockfile based on package manager
+    if (project.packageManager === 'pnpm') {
+        generatedFiles.push('pnpm-lock.yaml');
+    }
+    else if (project.packageManager === 'yarn') {
+        generatedFiles.push('yarn.lock');
+    }
+    else {
+        generatedFiles.push('package-lock.json');
+    }
+    // Add migrate script if postgres included
+    if (response.includePostgres) {
+        if (project.type === 'nextjs') {
+            generatedFiles.push('lib/db/migrate.ts');
+            generatedFiles.push('tsconfig.json'); // May be modified with exclude
+        }
+        else {
+            generatedFiles.push('scripts/migrate.ts');
+        }
+    }
     console.log(chalk.green('  ✓ Dockerfile'));
     console.log(chalk.green('  ✓ docker-compose.yml'));
     console.log(chalk.green('  ✓ docker-compose.build.yml'));
@@ -72,9 +102,14 @@ async function main() {
     console.log(chalk.green('  ✓ .claude/rules/coolify.md'));
     console.log(chalk.green('  ✓ entrypoint.sh'));
     if (response.includePostgres) {
-        console.log(chalk.green('  ✓ scripts/migrate.ts'));
+        if (project.type === 'nextjs') {
+            console.log(chalk.green('  ✓ lib/db/migrate.ts'));
+        }
+        else {
+            console.log(chalk.green('  ✓ scripts/migrate.ts'));
+        }
     }
-    // Setup GitHub
+    // Setup GitHub first (creates repo/remote if needed)
     if (response.createRepo) {
         console.log(chalk.bold('\nSetting up GitHub...'));
         try {
@@ -86,17 +121,14 @@ async function main() {
             else if (result.existingRemote) {
                 console.log(chalk.yellow(`  ⚠ Using existing remote: ${result.existingRemote}`));
             }
-            if (result.repoPushed) {
-                console.log(chalk.green('  ✓ Pushed to remote'));
+            if (result.developBranchCreated) {
+                console.log(chalk.green('  ✓ Pushed to develop branch'));
             }
             if (result.mainBranchPushed) {
-                console.log(chalk.green('  ✓ Pushed main branch'));
+                console.log(chalk.green('  ✓ Created/verified main branch'));
             }
             if (result.stagingBranchCreated) {
-                console.log(chalk.green('  ✓ Created staging branch'));
-            }
-            if (result.developBranchCreated) {
-                console.log(chalk.green('  ✓ Created develop branch'));
+                console.log(chalk.green('  ✓ Created/verified staging branch'));
             }
             if (result.defaultBranchSet) {
                 console.log(chalk.green('  ✓ Set develop as default branch'));
@@ -116,12 +148,29 @@ async function main() {
             console.log(chalk.yellow('  You can manually run: gh repo create Panoptic-IT-Solutions/' + response.projectName));
         }
     }
+    // Commit and push generated files to develop
+    console.log(chalk.bold('\nCommitting and pushing to develop...'));
+    try {
+        const commitResult = await commitAndPushToDevelop(generatedFiles);
+        if (commitResult.committed) {
+            console.log(chalk.green('  ✓ Committed changes'));
+        }
+        if (commitResult.pushed) {
+            console.log(chalk.green('  ✓ Pushed to develop branch'));
+        }
+        for (const warning of commitResult.warnings) {
+            console.log(chalk.yellow(`  ⚠ ${warning}`));
+        }
+    }
+    catch (error) {
+        console.log(chalk.yellow(`  ⚠ Failed to commit/push: ${error}`));
+        console.log(chalk.yellow('  You may need to manually commit and push the generated files'));
+    }
     console.log(chalk.bold.green('\n✅ Setup complete!\n'));
     console.log('Next steps:');
     console.log(chalk.cyan('  1. Review the generated files'));
     console.log(chalk.cyan('  2. Update .env with your secrets'));
-    console.log(chalk.cyan('  3. Push to develop to trigger first build'));
-    console.log(chalk.cyan('  4. Configure Coolify to deploy from staging branch\n'));
+    console.log(chalk.cyan('  3. Configure Coolify to deploy from staging branch\n'));
 }
 main().catch((error) => {
     console.error(chalk.red('Error:'), error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",