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

package/dist/generator.js

@@ -37,13 +37,6 @@ function addEsbuildToPackageJson(packageManager) {
                     : '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;
         }
         return false;

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,

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,7 +102,30 @@ 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'));
+        }
+    }
+    // Commit and push 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'));
     }
     // Setup GitHub
     if (response.createRepo) {
@@ -120,8 +173,7 @@ async function main() {
     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.3",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",