@panoptic-it-solutions/coolify-setup 1.1.10 → 1.1.12

package/dist/generator.js

@@ -56,7 +56,7 @@ function moveMigrationsToLibDb() {
         schemaTs: false,
     };
     const cwd = process.cwd();
-    // Items to move from db/ to lib/db/
+    // Items to move to lib/db/
     const itemsToMove = [
         { name: 'migrations', resultKey: 'migrations', isDir: true },
         { name: 'helpers', resultKey: 'helpers', isDir: true },
@@ -64,36 +64,48 @@ function moveMigrationsToLibDb() {
         { name: 'queries.ts', resultKey: 'queriesTs', isDir: false },
         { name: 'schema.ts', resultKey: 'schemaTs', isDir: false },
     ];
+    // Source directories to check (in order of priority)
+    const sourceRoots = ['db', 'src/db'];
     for (const item of itemsToMove) {
-        const sourcePath = join(cwd, 'db', item.name);
         const destPath = join(cwd, 'lib/db', item.name);
-        if (existsSync(sourcePath) && !existsSync(destPath)) {
-            // Ensure lib/db directory exists
-            if (item.isDir) {
-                ensureDir(join(destPath, 'dummy'));
-            }
-            else {
-                ensureDir(destPath);
+        // Skip if destination already exists
+        if (existsSync(destPath)) {
+            continue;
+        }
+        // Try each source root
+        for (const sourceRoot of sourceRoots) {
+            const sourcePath = join(cwd, sourceRoot, item.name);
+            if (existsSync(sourcePath)) {
+                // Ensure lib/db directory exists
+                if (item.isDir) {
+                    ensureDir(join(destPath, 'dummy'));
+                }
+                else {
+                    ensureDir(destPath);
+                }
+                // Move the item
+                renameSync(sourcePath, destPath);
+                result[item.resultKey] = true;
+                console.log(`Moved ${sourceRoot}/${item.name} → lib/db/${item.name}`);
+                break; // Found and moved, no need to check other source roots
             }
-            // Move the item
-            renameSync(sourcePath, destPath);
-            result[item.resultKey] = true;
-            console.log(`Moved db/${item.name} → lib/db/${item.name}`);
         }
     }
-    // Clean up empty db directory if it exists and is empty
-    const dbPath = join(cwd, 'db');
-    if (existsSync(dbPath)) {
-        try {
-            const contents = readdirSync(dbPath);
-            if (contents.length === 0) {
-                // Remove empty directory
-                execSync(`rmdir "${dbPath}"`, { stdio: 'pipe' });
-                console.log('Removed empty db/ directory');
+    // Clean up empty db directories
+    for (const sourceRoot of sourceRoots) {
+        const dbPath = join(cwd, sourceRoot);
+        if (existsSync(dbPath)) {
+            try {
+                const contents = readdirSync(dbPath);
+                if (contents.length === 0) {
+                    // Remove empty directory
+                    execSync(`rmdir "${dbPath}"`, { stdio: 'pipe' });
+                    console.log(`Removed empty ${sourceRoot}/ directory`);
+                }
+            }
+            catch {
+                // Ignore errors when cleaning up
             }
-        }
-        catch {
-            // Ignore errors when cleaning up
         }
     }
     return result;

package/dist/git.js

@@ -44,10 +44,10 @@ export async function commitAndPushToDevelop(files) {
     if (!isGitRepo()) {
         run('git init');
     }
-    // Stage all specified files
+    // Stage all specified files (use -A to also stage deletions)
     for (const file of files) {
         try {
-            run(`git add "${file}"`);
+            run(`git add -A "${file}"`);
         }
         catch {
             // File might not exist, that's ok

package/dist/index.js

@@ -85,11 +85,15 @@ async function main() {
     else {
         generatedFiles.push('package-lock.json');
     }
-    // Add migrate script if postgres included
+    // Add migrate script and db folder if postgres included
     if (response.includePostgres) {
         if (project.type === 'nextjs') {
             generatedFiles.push('lib/db/migrate.ts');
+            generatedFiles.push('lib/db/'); // Include all moved db files (migrations, helpers, schema, queries)
             generatedFiles.push('tsconfig.json'); // May be modified with exclude
+            // Stage deletions of source db folder if files were moved
+            generatedFiles.push('db/');
+            generatedFiles.push('src/db/');
         }
         else {
             generatedFiles.push('scripts/migrate.ts');

package/package.json

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