@panoptic-it-solutions/coolify-setup 1.0.0 → 1.1.1

package/dist/generator.js

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
 import { join, dirname } from 'path';
+import { execSync } from 'child_process';
 import { generateDockerfile, generateDockerCompose, generateDockerComposeBuild, generateWorkflow, generateEntrypoint, generateMigrateScript, generateClaudeRules, } from './templates/index.js';
 function ensureDir(filePath) {
     const dir = dirname(filePath);
@@ -12,7 +13,7 @@ function writeFile(relativePath, content) {
     ensureDir(fullPath);
     writeFileSync(fullPath, content, 'utf-8');
 }
-function addEsbuildToPackageJson() {
+function addEsbuildToPackageJson(packageManager) {
     const packageJsonPath = join(process.cwd(), 'package.json');
     if (!existsSync(packageJsonPath)) {
         console.log('Warning: package.json not found, skipping esbuild addition');
@@ -28,6 +29,14 @@ function addEsbuildToPackageJson() {
         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() });
             return true;
         }
         return false;
@@ -37,6 +46,31 @@ function addEsbuildToPackageJson() {
         return false;
     }
 }
+function excludeMigrateFromTsConfig(migratePath) {
+    const tsconfigPath = join(process.cwd(), 'tsconfig.json');
+    if (!existsSync(tsconfigPath)) {
+        console.log('Warning: tsconfig.json not found, skipping exclusion');
+        return false;
+    }
+    try {
+        const tsconfig = JSON.parse(readFileSync(tsconfigPath, 'utf-8'));
+        // Ensure exclude array exists
+        if (!tsconfig.exclude) {
+            tsconfig.exclude = ['node_modules'];
+        }
+        // Add migrate.ts to exclude if not already present
+        if (!tsconfig.exclude.includes(migratePath)) {
+            tsconfig.exclude.push(migratePath);
+            writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + '\n', 'utf-8');
+            return true;
+        }
+        return false;
+    }
+    catch (error) {
+        console.log('Warning: Failed to update tsconfig.json:', error);
+        return false;
+    }
+}
 export async function generateFiles(options) {
     const { projectName, projectType, packageManager, includePostgres, includeRedis, includeMinio, } = options;
     // Generate Dockerfile
@@ -78,15 +112,20 @@ export async function generateFiles(options) {
         const migrateScript = generateMigrateScript({ projectType });
         // For Next.js standalone projects, we need esbuild to bundle the migration script
         if (projectType === 'nextjs') {
-            const added = addEsbuildToPackageJson();
+            const added = addEsbuildToPackageJson(packageManager);
             if (added) {
                 console.log('Added esbuild to devDependencies (required for migration bundling)');
-                console.log('Run your package manager install command to install it');
             }
             // Write migrate.ts to lib/db/ for Next.js projects (will be bundled at build time)
-            const existingMigratePath = join(process.cwd(), 'lib/db/migrate.ts');
+            const migratePath = 'lib/db/migrate.ts';
+            const existingMigratePath = join(process.cwd(), migratePath);
             if (!existsSync(existingMigratePath)) {
-                writeFile('lib/db/migrate.ts', migrateScript);
+                writeFile(migratePath, migrateScript);
+            }
+            // Exclude migrate.ts from TypeScript compilation (it's bundled separately by esbuild)
+            const excluded = excludeMigrateFromTsConfig(migratePath);
+            if (excluded) {
+                console.log('Added lib/db/migrate.ts to tsconfig.json exclude (bundled separately)');
             }
         }
         else {

package/dist/git.d.ts

@@ -1 +1,11 @@
-export declare function setupGitHub(projectName: string): Promise<void>;
+export interface GitHubSetupResult {
+    repoCreated: boolean;
+    repoPushed: boolean;
+    mainBranchPushed: boolean;
+    stagingBranchCreated: boolean;
+    developBranchCreated: boolean;
+    defaultBranchSet: boolean;
+    existingRemote: string | null;
+    warnings: string[];
+}
+export declare function setupGitHub(projectName: string): Promise<GitHubSetupResult>;

package/dist/git.js

@@ -9,13 +9,12 @@ async function runAsync(command) {
     const { stdout } = await execAsync(command);
     return stdout.trim();
 }
-function hasGitRemote() {
+function getGitRemoteUrl() {
     try {
-        run('git remote get-url origin');
-        return true;
+        return run('git remote get-url origin');
     }
     catch {
-        return false;
+        return null;
     }
 }
 function isGitRepo() {
@@ -27,7 +26,24 @@ function isGitRepo() {
         return false;
     }
 }
+function isCorrectRemote(remoteUrl, projectName) {
+    const expectedPatterns = [
+        `github.com/${ORG}/${projectName}`,
+        `github.com:${ORG}/${projectName}`,
+    ];
+    return expectedPatterns.some(pattern => remoteUrl.includes(pattern));
+}
 export async function setupGitHub(projectName) {
+    const result = {
+        repoCreated: false,
+        repoPushed: false,
+        mainBranchPushed: false,
+        stagingBranchCreated: false,
+        developBranchCreated: false,
+        defaultBranchSet: false,
+        existingRemote: null,
+        warnings: [],
+    };
     // Initialize git if not already a repo
     if (!isGitRepo()) {
         run('git init');
@@ -48,14 +64,36 @@ export async function setupGitHub(projectName) {
     catch {
         throw new Error('Not authenticated with GitHub CLI. Run: gh auth login');
     }
-    // Create repo if no remote exists
-    if (!hasGitRemote()) {
-        // Create the repository
-        await runAsync(`gh repo create ${ORG}/${projectName} --private --source=. --push`);
+    // Check existing remote
+    const existingRemote = getGitRemoteUrl();
+    result.existingRemote = existingRemote;
+    if (existingRemote) {
+        // Validate remote points to the correct repo
+        if (!isCorrectRemote(existingRemote, projectName)) {
+            result.warnings.push(`Existing remote '${existingRemote}' does not match expected repo '${ORG}/${projectName}'. ` +
+                `Remove it with 'git remote remove origin' and re-run setup to create the correct repo.`);
+            // 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 {
-        // Remote exists, just push
-        run('git push origin HEAD');
+        // Create the repository
+        try {
+            await runAsync(`gh repo create ${ORG}/${projectName} --private --source=. --push`);
+            result.repoCreated = true;
+            result.repoPushed = true;
+        }
+        catch (error) {
+            throw new Error(`Failed to create repository: ${error}`);
+        }
     }
     // Ensure we're on main and push
     const currentBranch = run('git branch --show-current');
@@ -65,30 +103,35 @@ export async function setupGitHub(projectName) {
     // Push main
     try {
         run('git push origin main');
+        result.mainBranchPushed = true;
     }
     catch {
-        // May already be pushed
+        result.warnings.push('Failed to push main branch (may already exist)');
     }
     // Create staging branch from main
     try {
         run('git push origin main:staging');
+        result.stagingBranchCreated = true;
     }
     catch {
-        // May already exist
+        result.warnings.push('Failed to create staging branch (may already exist)');
     }
     // Create and checkout develop branch
     try {
         run('git checkout -b develop 2>/dev/null || git checkout develop');
         run('git push origin develop -u');
+        result.developBranchCreated = true;
     }
     catch {
-        // May already exist
+        result.warnings.push('Failed to create develop branch (may already exist)');
     }
     // Set develop as default branch
     try {
         await runAsync(`gh repo edit ${ORG}/${projectName} --default-branch develop`);
+        result.defaultBranchSet = true;
     }
     catch {
-        // May fail if not owner or already set
+        result.warnings.push('Failed to set develop as default branch (may lack permissions or already set)');
     }
+    return result;
 }

package/dist/index.js

@@ -78,11 +78,38 @@ async function main() {
     if (response.createRepo) {
         console.log(chalk.bold('\nSetting up GitHub...'));
         try {
-            await setupGitHub(response.projectName);
-            console.log(chalk.green(`  ✓ Created repo: Panoptic-IT-Solutions/${response.projectName}`));
-            console.log(chalk.green('  ✓ Pushed main branch'));
-            console.log(chalk.green('  ✓ Created staging branch'));
-            console.log(chalk.green('  ✓ Created develop branch (default)'));
+            const result = await setupGitHub(response.projectName);
+            // Report what actually happened
+            if (result.repoCreated) {
+                console.log(chalk.green(`  ✓ Created repo: Panoptic-IT-Solutions/${response.projectName}`));
+            }
+            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.mainBranchPushed) {
+                console.log(chalk.green('  ✓ Pushed main branch'));
+            }
+            if (result.stagingBranchCreated) {
+                console.log(chalk.green('  ✓ Created staging branch'));
+            }
+            if (result.developBranchCreated) {
+                console.log(chalk.green('  ✓ Created develop branch'));
+            }
+            if (result.defaultBranchSet) {
+                console.log(chalk.green('  ✓ Set develop as default branch'));
+            }
+            // Show warnings
+            for (const warning of result.warnings) {
+                console.log(chalk.yellow(`  ⚠ ${warning}`));
+            }
+            // If nothing succeeded, show a failure message
+            if (!result.repoCreated && !result.repoPushed && result.warnings.length > 0) {
+                console.log(chalk.red('\n  ✗ GitHub setup did not complete successfully'));
+                console.log(chalk.yellow('  You can manually run: gh repo create Panoptic-IT-Solutions/' + response.projectName));
+            }
         }
         catch (error) {
             console.log(chalk.red(`  ✗ GitHub setup failed: ${error}`));

package/package.json

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