@panoptic-it-solutions/coolify-setup 1.1.14 → 1.1.15

package/dist/detector.d.ts

@@ -4,5 +4,6 @@ export interface ProjectInfo {
     hasDockerfile: boolean;
     hasDockerCompose: boolean;
     name: string;
+    usesSrcDirectory: boolean;
 }
 export declare function detectProject(): Promise<ProjectInfo>;

package/dist/detector.js

@@ -19,6 +19,7 @@ export async function detectProject() {
     const hasYarnLock = exists('yarn.lock');
     const hasDockerfile = exists('Dockerfile');
     const hasDockerCompose = exists('docker-compose.yml');
+    const hasSrcApp = exists('src/app'); // Detect src/ directory structure
     let packageManager = 'npm';
     if (hasPnpmLock)
         packageManager = 'pnpm';
@@ -30,5 +31,6 @@ export async function detectProject() {
         hasDockerfile,
         hasDockerCompose,
         name: hasPackageJson ? getProjectName() : 'my-project',
+        usesSrcDirectory: hasSrcApp,
     };
 }

package/dist/generator.js

@@ -13,6 +13,12 @@ function writeFile(relativePath, content) {
     ensureDir(fullPath);
     writeFileSync(fullPath, content, 'utf-8');
 }
+function detectSrcDirectory() {
+    // Check if project uses src/ directory structure
+    const srcPath = join(process.cwd(), 'src');
+    const srcAppPath = join(process.cwd(), 'src/app');
+    return existsSync(srcPath) && existsSync(srcAppPath);
+}
 function addEsbuildToPackageJson(packageManager) {
     const packageJsonPath = join(process.cwd(), 'package.json');
     if (!existsSync(packageJsonPath)) {
@@ -47,9 +53,11 @@ function addEsbuildToPackageJson(packageManager) {
         return false;
     }
 }
-function copyMigrationsToLibDb() {
+function copyMigrationsToLibDb(usesSrcDirectory) {
     const cwd = process.cwd();
-    const destPath = join(cwd, 'lib/db/migrations');
+    // Use src/lib/db for projects with src/ directory, otherwise lib/db
+    const libDbPath = usesSrcDirectory ? 'src/lib/db' : 'lib/db';
+    const destPath = join(cwd, libDbPath, 'migrations');
     // Skip if destination already exists
     if (existsSync(destPath)) {
         return false;
@@ -59,17 +67,17 @@ function copyMigrationsToLibDb() {
     for (const sourceRoot of sourceRoots) {
         const sourcePath = join(cwd, sourceRoot, 'migrations');
         if (existsSync(sourcePath)) {
-            // Ensure lib/db directory exists
+            // Ensure destination directory exists
             ensureDir(join(destPath, 'dummy'));
             // Copy (not move) to preserve source imports
             execSync(`cp -r "${sourcePath}/." "${destPath}"`, { stdio: 'pipe' });
-            console.log(`Copied ${sourceRoot}/migrations → lib/db/migrations`);
+            console.log(`Copied ${sourceRoot}/migrations → ${libDbPath}/migrations`);
             return true;
         }
     }
     // No migrations found - create empty folder so Docker build doesn't fail
     ensureDir(join(destPath, 'dummy'));
-    console.log('Created empty lib/db/migrations (no source migrations found)');
+    console.log(`Created empty ${libDbPath}/migrations (no source migrations found)`);
     return true;
 }
 function excludeMigrateFromTsConfig(migratePath) {
@@ -99,11 +107,14 @@ function excludeMigrateFromTsConfig(migratePath) {
 }
 export async function generateFiles(options) {
     const { projectName, projectType, packageManager, includePostgres, includeRedis, includeMinio, } = options;
+    // Detect if project uses src/ directory structure
+    const usesSrcDirectory = projectType === 'nextjs' && detectSrcDirectory();
     // Generate Dockerfile
     const dockerfile = generateDockerfile({
         projectType,
         packageManager,
         includePostgres,
+        usesSrcDirectory,
     });
     writeFile('Dockerfile', dockerfile);
     // Generate docker-compose.yml
@@ -128,6 +139,7 @@ export async function generateFiles(options) {
     const entrypoint = generateEntrypoint({
         projectType,
         includePostgres,
+        usesSrcDirectory,
     });
     writeFile('entrypoint.sh', entrypoint);
     // Generate Claude rules
@@ -135,17 +147,19 @@ export async function generateFiles(options) {
     writeFile('.claude/rules/coolify.md', claudeRules);
     // Generate migrate.ts if postgres is included
     if (includePostgres) {
-        const migrateScript = generateMigrateScript({ projectType });
+        const migrateScript = generateMigrateScript({ projectType, usesSrcDirectory });
         // For Next.js standalone projects, we need esbuild to bundle the migration script
         if (projectType === 'nextjs') {
             const added = addEsbuildToPackageJson(packageManager);
             if (added) {
                 console.log('Added esbuild to devDependencies (required for migration bundling)');
             }
+            // Use src/lib/db for projects with src/ directory, otherwise lib/db
+            const libDbPath = usesSrcDirectory ? 'src/lib/db' : 'lib/db';
             // Copy migrations to lib/db/ for Docker build (don't move - preserve source imports)
-            copyMigrationsToLibDb();
+            copyMigrationsToLibDb(usesSrcDirectory);
             // Write migrate.ts to lib/db/ for Next.js projects (will be bundled at build time)
-            const migratePath = 'lib/db/migrate.ts';
+            const migratePath = `${libDbPath}/migrate.ts`;
             const existingMigratePath = join(process.cwd(), migratePath);
             if (!existsSync(existingMigratePath)) {
                 writeFile(migratePath, migrateScript);
@@ -153,7 +167,7 @@ export async function generateFiles(options) {
             // 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)');
+                console.log(`Added ${migratePath} to tsconfig.json exclude (bundled separately)`);
             }
         }
         else {

package/dist/index.js

@@ -88,8 +88,10 @@ async function main() {
     // 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/migrations/'); // Include copied migrations folder
+            // Use src/lib/db for projects with src/ directory, otherwise lib/db
+            const libDbPath = project.usesSrcDirectory ? 'src/lib/db' : 'lib/db';
+            generatedFiles.push(`${libDbPath}/migrate.ts`);
+            generatedFiles.push(`${libDbPath}/migrations/`); // Include copied migrations folder
             generatedFiles.push('tsconfig.json'); // May be modified with exclude
         }
         else {
@@ -104,7 +106,8 @@ async function main() {
     console.log(chalk.green('  ✓ entrypoint.sh'));
     if (response.includePostgres) {
         if (project.type === 'nextjs') {
-            console.log(chalk.green('  ✓ lib/db/migrate.ts'));
+            const libDbPath = project.usesSrcDirectory ? 'src/lib/db' : 'lib/db';
+            console.log(chalk.green(`  ✓ ${libDbPath}/migrate.ts`));
         }
         else {
             console.log(chalk.green('  ✓ scripts/migrate.ts'));

package/dist/templates/dockerfile.d.ts

@@ -2,5 +2,6 @@ export interface DockerfileOptions {
     projectType: 'nextjs' | 'node';
     packageManager: 'pnpm' | 'npm' | 'yarn';
     includePostgres: boolean;
+    usesSrcDirectory?: boolean;
 }
 export declare function generateDockerfile(options: DockerfileOptions): string;

package/dist/templates/dockerfile.js

@@ -5,7 +5,9 @@ export function generateDockerfile(options) {
     return generateNodeDockerfile(options);
 }
 function generateNextjsDockerfile(options) {
-    const { packageManager, includePostgres } = options;
+    const { packageManager, includePostgres, usesSrcDirectory } = options;
+    // Use src/lib/db for projects with src/ directory structure
+    const libDbPath = usesSrcDirectory ? 'src/lib/db' : 'lib/db';
     const installCmd = packageManager === 'pnpm'
         ? 'pnpm install --frozen-lockfile'
         : packageManager === 'yarn'
@@ -39,12 +41,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
 # 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` : '';
+RUN ${esbuildCmd} ${libDbPath}/migrate.ts --bundle --platform=node --target=node22 --outfile=${libDbPath}/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/${libDbPath}/migrations ./${libDbPath}/migrations
+COPY --from=builder --chown=nextjs:nodejs /app/${libDbPath}/migrate.bundle.js ./${libDbPath}/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` : '';

package/dist/templates/entrypoint.d.ts

@@ -1,5 +1,6 @@
 export interface EntrypointOptions {
     projectType: 'nextjs' | 'node';
     includePostgres: boolean;
+    usesSrcDirectory?: boolean;
 }
 export declare function generateEntrypoint(options: EntrypointOptions): string;

package/dist/templates/entrypoint.js

@@ -1,5 +1,7 @@
 export function generateEntrypoint(options) {
-    const { projectType, includePostgres } = options;
+    const { projectType, includePostgres, usesSrcDirectory } = options;
+    // Use src/lib/db for projects with src/ directory, otherwise lib/db
+    const libDbPath = usesSrcDirectory ? 'src/lib/db' : 'lib/db';
     // For Next.js standalone, we run the bundled JS file (no tsx needed)
     // For Node.js, we use tsx since full node_modules is available
     const migrationStep = includePostgres
@@ -7,7 +9,7 @@ export function generateEntrypoint(options) {
             ? `
 # Run database migrations (bundled JS with all deps baked in)
 echo "⏳ Running database migrations..."
-node lib/db/migrate.bundle.js
+node ${libDbPath}/migrate.bundle.js
 `
             : `
 # Run database migrations

package/dist/templates/migrate.d.ts

@@ -1,4 +1,5 @@
 export interface MigrateScriptOptions {
     projectType: 'nextjs' | 'node';
+    usesSrcDirectory?: boolean;
 }
 export declare function generateMigrateScript(options?: MigrateScriptOptions): string;

package/dist/templates/migrate.js

@@ -1,9 +1,10 @@
 export function generateMigrateScript(options) {
     const projectType = options?.projectType ?? 'nextjs';
-    // For Next.js, migrations are in lib/db/migrations (bundled with esbuild)
+    const usesSrcDirectory = options?.usesSrcDirectory ?? false;
+    // For Next.js, migrations are in lib/db/migrations (or src/lib/db/migrations for src/ projects)
     // For Node.js, migrations are in scripts/migrations (run with tsx)
     const migrationsFolder = projectType === 'nextjs'
-        ? './lib/db/migrations'
+        ? (usesSrcDirectory ? './src/lib/db/migrations' : './lib/db/migrations')
         : './scripts/migrations';
     return `import { drizzle } from 'drizzle-orm/postgres-js';
 import { migrate } from 'drizzle-orm/postgres-js/migrator';

package/package.json

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