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

package/dist/generator.js

@@ -48,29 +48,38 @@ function addEsbuildToPackageJson(packageManager) {
     }
 }
 function moveMigrationsToLibDb() {
-    const result = { movedMigrations: false, movedMigrateTs: false };
+    const result = {
+        migrations: false,
+        helpers: false,
+        migrateTs: false,
+        queriesTs: false,
+        schemaTs: 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');
+    // Items to move from db/ to lib/db/
+    const itemsToMove = [
+        { name: 'migrations', resultKey: 'migrations', isDir: true },
+        { name: 'helpers', resultKey: 'helpers', isDir: true },
+        { name: 'migrate.ts', resultKey: 'migrateTs', isDir: false },
+        { name: 'queries.ts', resultKey: 'queriesTs', isDir: false },
+        { name: 'schema.ts', resultKey: 'schemaTs', isDir: false },
+    ];
+    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);
+            }
+            // 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');

package/dist/templates/dockerfile.js

@@ -33,16 +33,21 @@ function generateNextjsDockerfile(options) {
             : '';
     // For Next.js standalone, we bundle the migration script with esbuild at build time
     // This avoids module resolution issues in the minimal standalone container
+    // postgres must be externalized due to pnpm's symlink structure causing resolution issues
     const migrationBundle = includePostgres ? `
 
 # 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` : '';
+# postgres is externalized and copied separately due to pnpm symlink resolution issues
+RUN ${esbuildCmd} lib/db/migrate.ts --bundle --platform=node --target=node22 --outfile=lib/db/migrate.bundle.js --external:dotenv --external:postgres` : '';
     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 --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 due to pnpm symlinks)
+COPY --from=builder --chown=nextjs:nodejs /app/node_modules/.pnpm/postgres@*/node_modules/postgres ./node_modules/postgres` : '';
     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.8",
+  "version": "1.1.10",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",