@panoptic-it-solutions/coolify-setup 1.1.7 → 1.1.8

package/dist/generator.js

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, renameSync, readdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { execSync } from 'child_process';
 import { generateDockerfile, generateDockerCompose, generateDockerComposeBuild, generateWorkflow, generateEntrypoint, generateMigrateScript, generateClaudeRules, } from './templates/index.js';
@@ -47,6 +47,48 @@ function addEsbuildToPackageJson(packageManager) {
         return false;
     }
 }
+function moveMigrationsToLibDb() {
+    const result = { movedMigrations: false, movedMigrateTs: false };
+    const cwd = process.cwd();
+    // Check if db/migrations exists at root level (sibling to lib)
+    const dbMigrationsPath = join(cwd, 'db/migrations');
+    const libDbMigrationsPath = join(cwd, 'lib/db/migrations');
+    if (existsSync(dbMigrationsPath) && !existsSync(libDbMigrationsPath)) {
+        // Ensure lib/db directory exists
+        ensureDir(join(libDbMigrationsPath, 'dummy'));
+        // Move the entire migrations folder
+        renameSync(dbMigrationsPath, libDbMigrationsPath);
+        result.movedMigrations = true;
+        console.log('Moved db/migrations → lib/db/migrations');
+    }
+    // Check if db/migrate.ts exists at root level
+    const dbMigrateTsPath = join(cwd, 'db/migrate.ts');
+    const libDbMigrateTsPath = join(cwd, 'lib/db/migrate.ts');
+    if (existsSync(dbMigrateTsPath) && !existsSync(libDbMigrateTsPath)) {
+        // Ensure lib/db directory exists
+        ensureDir(libDbMigrateTsPath);
+        // Move migrate.ts
+        renameSync(dbMigrateTsPath, libDbMigrateTsPath);
+        result.movedMigrateTs = true;
+        console.log('Moved db/migrate.ts → lib/db/migrate.ts');
+    }
+    // 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');
+            }
+        }
+        catch {
+            // Ignore errors when cleaning up
+        }
+    }
+    return result;
+}
 function excludeMigrateFromTsConfig(migratePath) {
     const tsconfigPath = join(process.cwd(), 'tsconfig.json');
     if (!existsSync(tsconfigPath)) {
@@ -117,6 +159,8 @@ export async function generateFiles(options) {
             if (added) {
                 console.log('Added esbuild to devDependencies (required for migration bundling)');
             }
+            // Move migrations from db/ to lib/db/ if they exist at the wrong location
+            moveMigrationsToLibDb();
             // Write migrate.ts to lib/db/ for Next.js projects (will be bundled at build time)
             const migratePath = 'lib/db/migrate.ts';
             const existingMigratePath = join(process.cwd(), migratePath);

package/dist/templates/dockerfile.js

@@ -37,15 +37,12 @@ function generateNextjsDockerfile(options) {
 
 # Build the migration bundle (single JS file with all deps baked in)
 # This avoids module resolution issues in the standalone container
-RUN ${esbuildCmd} lib/db/migrate.ts --bundle --platform=node --target=node22 --outfile=lib/db/migrate.bundle.js --external:dotenv --external:postgres` : '';
+RUN ${esbuildCmd} lib/db/migrate.ts --bundle --platform=node --target=node22 --outfile=lib/db/migrate.bundle.js --external:dotenv` : '';
     const migrationCopy = includePostgres ? `
 
 # Copy database migrations and bundled migration script
 COPY --from=builder --chown=nextjs:nodejs /app/lib/db/migrations ./lib/db/migrations
-COPY --from=builder --chown=nextjs:nodejs /app/lib/db/migrate.bundle.js ./lib/db/migrate.bundle.js
-
-# Copy postgres module for migration script (externalized from bundle)
-COPY --from=builder --chown=nextjs:nodejs /app/node_modules/.pnpm/postgres@*/node_modules/postgres ./node_modules/postgres` : '';
+COPY --from=builder --chown=nextjs:nodejs /app/lib/db/migrate.bundle.js ./lib/db/migrate.bundle.js` : '';
     return `# syntax=docker.io/docker/dockerfile:1
 
 FROM node:22-alpine AS base

package/package.json

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