@geekmidas/cli 0.39.0 → 0.40.0

package/src/workspace/schema.ts

@@ -57,6 +57,26 @@ const ClientConfigSchema = z.object({
  */
 const AuthProviderSchema = z.enum(['better-auth']);
 
+/**
+ * Backend framework schema for non-gkm apps.
+ */
+const BackendFrameworkSchema = z.enum([
+	'hono',
+	'better-auth',
+	'express',
+	'fastify',
+]);
+
+/**
+ * Frontend framework schema.
+ */
+const FrontendFrameworkSchema = z.enum(['nextjs', 'remix', 'vite']);
+
+/**
+ * Combined framework schema (backend or frontend).
+ */
+const FrameworkSchema = z.union([BackendFrameworkSchema, FrontendFrameworkSchema]);
+
 /**
  * Deploy target schema.
  * Currently only 'dokploy' is supported.
@@ -205,8 +225,11 @@ const AppConfigSchema = z
 		runtime: z.enum(['node', 'bun']).optional(),
 		env: z.union([z.string(), z.array(z.string())]).optional(),
 
-		// Frontend-specific
-		framework: z.enum(['nextjs']).optional(),
+		// Entry point for non-gkm apps (used by dev and docker build)
+		entry: z.string().optional(),
+
+		// Framework (backend or frontend)
+		framework: FrameworkSchema.optional(),
 		client: ClientConfigSchema.optional(),
 
 		// Auth-specific
@@ -215,14 +238,17 @@ const AppConfigSchema = z
 	// Note: routes is optional for backend apps - some backends like auth servers don't use routes
 	.refine(
 		(data) => {
-			// Frontend apps must have framework
-			if (data.type === 'frontend' && !data.framework) {
-				return false;
+			// Frontend apps must have a frontend framework
+			if (data.type === 'frontend') {
+				const frontendFrameworks = ['nextjs', 'remix', 'vite'];
+				if (!data.framework || !frontendFrameworks.includes(data.framework)) {
+					return false;
+				}
 			}
 			return true;
 		},
 		{
-			message: 'Frontend apps must have framework defined',
+			message: 'Frontend apps must have a valid frontend framework (nextjs, remix, vite)',
 			path: ['framework'],
 		},
 	)

package/src/workspace/types.ts

@@ -16,6 +16,16 @@ import type {
  */
 export type DeployTarget = 'dokploy' | 'vercel' | 'cloudflare';
 
+/**
+ * Backend framework types for apps that don't use gkm routes.
+ */
+export type BackendFramework = 'hono' | 'better-auth' | 'express' | 'fastify';
+
+/**
+ * Frontend framework types.
+ */
+export type FrontendFramework = 'nextjs' | 'remix' | 'vite';
+
 /**
  * Service image configuration for custom Docker images.
  */
@@ -51,6 +61,20 @@ export interface ServicesConfig {
 	mail?: boolean | MailServiceConfig;
 }
 
+/**
+ * Stage-based domain configuration.
+ * Maps deployment stages to base domains.
+ * @example { development: 'dev.myapp.com', production: 'myapp.com' }
+ */
+export type DokployDomainsConfig = Record<string, string>;
+
+/**
+ * Per-app domain override configuration.
+ * Can be a single domain string or stage-specific domains.
+ * @example 'api.custom.com' or { production: 'api.custom.com', staging: 'api.staging.com' }
+ */
+export type AppDomainConfig = string | Record<string, string>;
+
 /**
  * Dokploy workspace deployment configuration.
  */
@@ -63,6 +87,13 @@ export interface DokployWorkspaceConfig {
 	registry?: string;
 	/** Registry ID in Dokploy */
 	registryId?: string;
+	/**
+	 * Stage-based domain configuration.
+	 * The main frontend app gets the base domain.
+	 * Other apps get {appName}.{baseDomain} by default.
+	 * @example { development: 'dev.myapp.com', production: 'myapp.com' }
+	 */
+	domains?: DokployDomainsConfig;
 }
 
 /**
@@ -163,11 +194,34 @@ interface AppConfigBase {
 	/** Environment file(s) to load */
 	env?: string | string[];
 
+	// Entry point for non-gkm apps
+	/**
+	 * Entry file path for apps that don't use gkm routes.
+	 * Used by both `gkm dev` (runs with tsx) and Docker builds (bundles with tsdown).
+	 * @example './src/index.ts'
+	 */
+	entry?: string;
+
 	// Frontend-specific
-	/** Frontend framework (currently only 'nextjs') */
-	framework?: 'nextjs';
+	/** Framework for the app (frontend or backend without gkm routes) */
+	framework?: BackendFramework | FrontendFramework;
 	/** Client generation configuration */
 	client?: ClientConfig;
+
+	// Deployment
+	/**
+	 * Override domain for this app (per-stage or single value).
+	 * @example 'api.custom.com' or { production: 'api.custom.com', staging: 'api.staging.com' }
+	 */
+	domain?: AppDomainConfig;
+
+	/**
+	 * Required environment variables for entry-based apps.
+	 * Use this instead of envParser for apps that don't use gkm routes.
+	 * The deploy command uses this to filter which secrets to embed.
+	 * @example ['DATABASE_URL', 'BETTER_AUTH_SECRET']
+	 */
+	requiredEnv?: string[];
 }
 
 /**
@@ -294,6 +348,14 @@ export interface NormalizedAppConfig extends Omit<AppConfigBase, 'type'> {
 	dependencies: string[];
 	/** Resolved deploy target (app.deploy > deploy.default > 'dokploy') */
 	resolvedDeployTarget: DeployTarget;
+	/** Entry file path for non-gkm apps */
+	entry?: string;
+	/** Framework for the app */
+	framework?: BackendFramework | FrontendFramework;
+	/** Override domain for this app */
+	domain?: AppDomainConfig;
+	/** Required environment variables for entry-based apps */
+	requiredEnv?: string[];
 }
 
 /**