@geekmidas/cli 1.10.35 → 1.10.37

package/src/setup/fullstack-secrets.ts

@@ -55,13 +55,19 @@ export function generateFullstackCustomSecrets(
 	const frontendPorts: number[] = [];
 
 	for (const [appName, appConfig] of Object.entries(workspace.apps)) {
-		if (appConfig.type === 'frontend') {
+		if (appConfig.type === 'web') {
 			frontendPorts.push(appConfig.port);
 			const upperName = appName.toUpperCase();
 			customs[`${upperName}_URL`] = `http://localhost:${appConfig.port}`;
 			continue;
 		}
 
+		// Mobile apps (Expo, etc.) don't run on a host port the backend
+		// cares about for CORS, and don't need DB credentials.
+		if (appConfig.type === 'mobile') {
+			continue;
+		}
+
 		// Backend apps with database: generate per-app DB passwords and URLs
 		const password = generateDbPassword();
 		const upperName = appName.toUpperCase();

package/src/setup/index.ts

@@ -359,7 +359,8 @@ function printSummary(workspace: NormalizedWorkspace, stage: string): void {
 
 	logger.log('📋 Apps:');
 	for (const [name, app] of Object.entries(workspace.apps)) {
-		const icon = app.type === 'frontend' ? '🌐' : '🔧';
+		const icon =
+			app.type === 'web' ? '🌐' : app.type === 'mobile' ? '📱' : '🔧';
 		logger.log(`   ${icon} ${name} → http://localhost:${app.port}`);
 	}
 

package/src/test/__tests__/__fixtures__/workspace.ts

@@ -57,7 +57,7 @@ export function createFullstackWorkspace(): ReturnType<
 					dependencies: [],
 				},
 				web: {
-					type: 'frontend',
+					type: 'web',
 					path: 'apps/web',
 					port: 3001,
 					framework: 'nextjs',

package/src/test/__tests__/web.spec.ts

@@ -104,7 +104,7 @@ describe('web (frontend) app context', () => {
 						dependencies: [],
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3001,
 						framework: 'nextjs',
@@ -149,7 +149,7 @@ describe('web (frontend) app context', () => {
 						dependencies: [],
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3001,
 						framework: 'nextjs',

package/src/workspace/__tests__/client-generator.spec.ts

@@ -108,7 +108,7 @@ describe('Client Generator', () => {
 						resolvedDeployTarget: 'dokploy',
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3002,
 						dependencies: ['api', 'auth'],
@@ -147,7 +147,7 @@ describe('Client Generator', () => {
 						// No routes - not an HTTP backend
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3002,
 						dependencies: ['api', 'worker'],
@@ -204,21 +204,21 @@ describe('Client Generator', () => {
 						resolvedDeployTarget: 'dokploy',
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3001,
 						dependencies: ['api'],
 						resolvedDeployTarget: 'dokploy',
 					},
 					admin: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/admin',
 						port: 3002,
 						dependencies: ['api'],
 						resolvedDeployTarget: 'dokploy',
 					},
 					docs: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/docs',
 						port: 3003,
 						dependencies: [], // No API dependency
@@ -291,7 +291,7 @@ describe('Client Generator', () => {
 				root: '/project',
 				apps: {
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3000,
 						dependencies: [],

package/src/workspace/__tests__/index.spec.ts

@@ -406,7 +406,7 @@ describe('getAppGkmConfig', () => {
 		const config: WorkspaceConfig = {
 			apps: {
 				web: {
-					type: 'frontend',
+					type: 'web',
 					path: 'apps/web',
 					port: 3001,
 					framework: 'nextjs',
@@ -444,7 +444,7 @@ describe('getAppBuildOrder', () => {
 		const config: WorkspaceConfig = {
 			apps: {
 				web: {
-					type: 'frontend',
+					type: 'web',
 					path: 'apps/web',
 					port: 3001,
 					framework: 'nextjs',
@@ -509,7 +509,7 @@ describe('getDependencyEnvVars', () => {
 		const config: WorkspaceConfig = {
 			apps: {
 				web: {
-					type: 'frontend',
+					type: 'web',
 					path: 'apps/web',
 					port: 3001,
 					framework: 'nextjs',
@@ -545,7 +545,7 @@ describe('getDependencyEnvVars', () => {
 		const config: WorkspaceConfig = {
 			apps: {
 				web: {
-					type: 'frontend',
+					type: 'web',
 					path: 'apps/web',
 					port: 3001,
 					framework: 'nextjs',
@@ -604,6 +604,98 @@ describe('getDependencyEnvVars', () => {
 
 		expect(envVars).toEqual({});
 	});
+
+	it('should emit VITE_ prefix for vite apps', () => {
+		const config: WorkspaceConfig = {
+			apps: {
+				web: {
+					type: 'frontend',
+					path: 'apps/web',
+					port: 5173,
+					framework: 'vite',
+					dependencies: ['api'],
+				},
+				api: {
+					type: 'backend',
+					path: 'apps/api',
+					port: 3000,
+					routes: './src/**/*.ts',
+				},
+			},
+		};
+
+		const workspace = normalizeWorkspace(config, '/project');
+		const envVars = getDependencyEnvVars(workspace, 'web');
+
+		expect(envVars).toEqual({
+			API_URL: 'http://localhost:3000',
+			VITE_API_URL: 'http://localhost:3000',
+		});
+		expect(envVars.NEXT_PUBLIC_API_URL).toBeUndefined();
+	});
+
+	it('should emit VITE_ prefix for tanstack-start apps', () => {
+		const config: WorkspaceConfig = {
+			apps: {
+				web: {
+					type: 'frontend',
+					path: 'apps/web',
+					port: 3000,
+					framework: 'tanstack-start',
+					dependencies: ['api', 'auth'],
+				},
+				api: {
+					type: 'backend',
+					path: 'apps/api',
+					port: 3001,
+					routes: './src/**/*.ts',
+				},
+				auth: {
+					type: 'backend',
+					path: 'apps/auth',
+					port: 3002,
+					entry: './src/index.ts',
+				},
+			},
+		};
+
+		const workspace = normalizeWorkspace(config, '/project');
+		const envVars = getDependencyEnvVars(workspace, 'web');
+
+		expect(envVars).toEqual({
+			API_URL: 'http://localhost:3001',
+			VITE_API_URL: 'http://localhost:3001',
+			AUTH_URL: 'http://localhost:3002',
+			VITE_AUTH_URL: 'http://localhost:3002',
+		});
+	});
+
+	it('should emit only un-prefixed URLs for remix apps', () => {
+		const config: WorkspaceConfig = {
+			apps: {
+				web: {
+					type: 'frontend',
+					path: 'apps/web',
+					port: 3000,
+					framework: 'remix',
+					dependencies: ['api'],
+				},
+				api: {
+					type: 'backend',
+					path: 'apps/api',
+					port: 3001,
+					routes: './src/**/*.ts',
+				},
+			},
+		};
+
+		const workspace = normalizeWorkspace(config, '/project');
+		const envVars = getDependencyEnvVars(workspace, 'web');
+
+		expect(envVars).toEqual({
+			API_URL: 'http://localhost:3001',
+		});
+	});
 });
 
 describe('getEndpointForStage', () => {

package/src/workspace/__tests__/publicEnv.spec.ts

@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest';
+import {
+	getPublicEnvPrefix,
+	PUBLIC_ENV_PREFIXES,
+	stripPublicPrefix,
+} from '../publicEnv.ts';
+
+describe('getPublicEnvPrefix', () => {
+	it('returns NEXT_PUBLIC_ for nextjs', () => {
+		expect(getPublicEnvPrefix('nextjs')).toBe('NEXT_PUBLIC_');
+	});
+
+	it('returns VITE_ for vite', () => {
+		expect(getPublicEnvPrefix('vite')).toBe('VITE_');
+	});
+
+	it('returns VITE_ for tanstack-start', () => {
+		expect(getPublicEnvPrefix('tanstack-start')).toBe('VITE_');
+	});
+
+	it('returns EXPO_PUBLIC_ for expo', () => {
+		expect(getPublicEnvPrefix('expo')).toBe('EXPO_PUBLIC_');
+	});
+
+	it('returns empty string for remix', () => {
+		expect(getPublicEnvPrefix('remix')).toBe('');
+	});
+
+	it('falls back to NEXT_PUBLIC_ when framework is undefined', () => {
+		expect(getPublicEnvPrefix(undefined)).toBe('NEXT_PUBLIC_');
+	});
+
+	it('falls back to NEXT_PUBLIC_ for backend frameworks', () => {
+		expect(getPublicEnvPrefix('hono')).toBe('NEXT_PUBLIC_');
+		expect(getPublicEnvPrefix('better-auth')).toBe('NEXT_PUBLIC_');
+	});
+});
+
+describe('stripPublicPrefix', () => {
+	it('strips NEXT_PUBLIC_', () => {
+		expect(stripPublicPrefix('NEXT_PUBLIC_AUTH_URL')).toBe('AUTH_URL');
+	});
+
+	it('strips VITE_', () => {
+		expect(stripPublicPrefix('VITE_API_URL')).toBe('API_URL');
+	});
+
+	it('strips EXPO_PUBLIC_', () => {
+		expect(stripPublicPrefix('EXPO_PUBLIC_API_URL')).toBe('API_URL');
+	});
+
+	it('returns null when no known prefix matches', () => {
+		expect(stripPublicPrefix('AUTH_URL')).toBeNull();
+		expect(stripPublicPrefix('REACT_APP_FOO')).toBeNull();
+	});
+});
+
+describe('PUBLIC_ENV_PREFIXES', () => {
+	it('exposes NEXT_PUBLIC_, VITE_, and EXPO_PUBLIC_', () => {
+		expect(PUBLIC_ENV_PREFIXES).toContain('NEXT_PUBLIC_');
+		expect(PUBLIC_ENV_PREFIXES).toContain('VITE_');
+		expect(PUBLIC_ENV_PREFIXES).toContain('EXPO_PUBLIC_');
+	});
+});

package/src/workspace/__tests__/schema.spec.ts

@@ -47,7 +47,7 @@ describe('WorkspaceConfigSchema', () => {
 						openapi: { enabled: true, title: 'My API' },
 					},
 					web: {
-						type: 'frontend' as const,
+						type: 'web' as const,
 						path: 'apps/web',
 						port: 3001,
 						framework: 'nextjs' as const,
@@ -82,7 +82,7 @@ describe('WorkspaceConfigSchema', () => {
 
 			expect(result.name).toBe('my-saas');
 			expect(result.apps.api.type).toBe('backend');
-			expect(result.apps.web.type).toBe('frontend');
+			expect(result.apps.web.type).toBe('web');
 			expect(result.apps.web.dependencies).toEqual(['api']);
 			expect(result.shared?.packages).toEqual(['packages/*']);
 			expect(result.deploy?.default).toBe('dokploy');
@@ -163,7 +163,7 @@ describe('WorkspaceConfigSchema', () => {
 			const config = {
 				apps: {
 					web: {
-						type: 'frontend' as const,
+						type: 'web' as const,
 						path: 'apps/web',
 						port: 3001,
 						// Missing framework
@@ -197,7 +197,7 @@ describe('WorkspaceConfigSchema', () => {
 			const config = {
 				apps: {
 					web: {
-						type: 'frontend' as const,
+						type: 'web' as const,
 						path: 'apps/web',
 						port: 3001,
 						framework: 'nextjs' as const,
@@ -479,53 +479,50 @@ describe('WorkspaceConfigSchema', () => {
 	});
 
 	describe('auth app configuration', () => {
-		it('should accept auth app with provider', () => {
+		it('should accept auth app as backend with better-auth framework', () => {
 			const config = {
 				apps: {
 					auth: {
-						type: 'auth' as const,
+						type: 'backend' as const,
 						path: 'apps/auth',
 						port: 3002,
-						provider: 'better-auth' as const,
+						framework: 'better-auth' as const,
 					},
 				},
 			};
 
 			const result = validateWorkspaceConfig(config);
 
-			expect(result.apps.auth.type).toBe('auth');
-			expect(result.apps.auth.provider).toBe('better-auth');
+			expect(result.apps.auth.type).toBe('backend');
+			expect(result.apps.auth.framework).toBe('better-auth');
 		});
 
-		it('should reject auth app without provider', () => {
+		it('should accept auth backend without explicit framework', () => {
+			// Backend type defaults are permissive — framework is optional.
 			const config = {
 				apps: {
 					auth: {
-						type: 'auth' as const,
+						type: 'backend' as const,
 						path: 'apps/auth',
 						port: 3002,
-						// Missing provider
 					},
 				},
 			};
 
-			const result = safeValidateWorkspaceConfig(config);
+			const result = validateWorkspaceConfig(config);
 
-			expect(result.success).toBe(false);
-			if (result.error) {
-				const formatted = formatValidationErrors(result.error);
-				expect(formatted).toContain('Auth apps must have provider defined');
-			}
+			expect(result.apps.auth.type).toBe('backend');
+			expect(result.apps.auth.framework).toBeUndefined();
 		});
 
-		it('should allow auth app with backend properties', () => {
+		it('should allow auth backend with additional backend properties', () => {
 			const config = {
 				apps: {
 					auth: {
-						type: 'auth' as const,
+						type: 'backend' as const,
 						path: 'apps/auth',
 						port: 3002,
-						provider: 'better-auth' as const,
+						framework: 'better-auth' as const,
 						envParser: './src/config/env',
 						logger: './src/logger',
 						telescope: true,
@@ -535,12 +532,12 @@ describe('WorkspaceConfigSchema', () => {
 
 			const result = validateWorkspaceConfig(config);
 
-			expect(result.apps.auth.type).toBe('auth');
+			expect(result.apps.auth.framework).toBe('better-auth');
 			expect(result.apps.auth.envParser).toBe('./src/config/env');
 			expect(result.apps.auth.telescope).toBe(true);
 		});
 
-		it('should validate fullstack workspace with auth app', () => {
+		it('should validate fullstack workspace with auth backend', () => {
 			const config = {
 				name: 'fullstack-app',
 				apps: {
@@ -552,13 +549,13 @@ describe('WorkspaceConfigSchema', () => {
 						dependencies: ['auth'],
 					},
 					auth: {
-						type: 'auth' as const,
+						type: 'backend' as const,
 						path: 'apps/auth',
 						port: 3002,
-						provider: 'better-auth' as const,
+						framework: 'better-auth' as const,
 					},
 					web: {
-						type: 'frontend' as const,
+						type: 'web' as const,
 						path: 'apps/web',
 						port: 3001,
 						framework: 'nextjs' as const,
@@ -570,18 +567,18 @@ describe('WorkspaceConfigSchema', () => {
 			const result = validateWorkspaceConfig(config);
 
 			expect(result.apps.api.dependencies).toEqual(['auth']);
-			expect(result.apps.auth.type).toBe('auth');
+			expect(result.apps.auth.framework).toBe('better-auth');
 			expect(result.apps.web.dependencies).toEqual(['api', 'auth']);
 		});
 
-		it('should reject invalid auth provider', () => {
+		it('should reject auth backend with invalid framework value', () => {
 			const config = {
 				apps: {
 					auth: {
-						type: 'auth' as const,
+						type: 'backend' as const,
 						path: 'apps/auth',
 						port: 3002,
-						provider: 'invalid-provider',
+						framework: 'invalid-framework',
 					},
 				},
 			};

package/src/workspace/__tests__/type-inference.spec.ts

@@ -14,7 +14,7 @@ describe('Type Inference', () => {
 						routes: './src/**/*.ts',
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3001,
 						framework: 'nextjs',
@@ -46,7 +46,7 @@ describe('Type Inference', () => {
 						routes: './src/**/*.ts',
 					},
 					web: {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3002,
 						framework: 'nextjs',
@@ -69,7 +69,7 @@ describe('Type Inference', () => {
 							routes: './src/**/*.ts',
 						},
 						web: {
-							type: 'frontend',
+							type: 'web',
 							path: 'apps/web',
 							port: 3001,
 							framework: 'nextjs',
@@ -186,14 +186,14 @@ describe('Type Inference', () => {
 						dependencies: ['user-service'],
 					},
 					'web-app': {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/web',
 						port: 3003,
 						framework: 'nextjs',
 						dependencies: ['api-gateway'],
 					},
 					'admin-dashboard': {
-						type: 'frontend',
+						type: 'web',
 						path: 'apps/admin',
 						port: 3004,
 						framework: 'nextjs',

package/src/workspace/client-generator.ts

@@ -55,25 +55,25 @@ export function shouldRegenerateClient(
 }
 
 /**
- * Get backend apps that a frontend depends on.
+ * Get backend apps that a web/mobile client depends on.
  */
 export function getBackendDependencies(
 	workspace: NormalizedWorkspace,
-	frontendAppName: string,
+	clientAppName: string,
 ): string[] {
-	const frontendApp = workspace.apps[frontendAppName];
-	if (!frontendApp || frontendApp.type !== 'frontend') {
+	const clientApp = workspace.apps[clientAppName];
+	if (!clientApp || (clientApp.type !== 'web' && clientApp.type !== 'mobile')) {
 		return [];
 	}
 
-	return frontendApp.dependencies.filter((dep) => {
+	return clientApp.dependencies.filter((dep) => {
 		const depApp = workspace.apps[dep];
 		return depApp?.type === 'backend' && depApp.routes;
 	});
 }
 
 /**
- * Get frontend apps that depend on a backend app.
+ * Get web/mobile apps that depend on a backend app.
  */
 export function getDependentFrontends(
 	workspace: NormalizedWorkspace,
@@ -82,7 +82,10 @@ export function getDependentFrontends(
 	const dependentApps: string[] = [];
 
 	for (const [appName, app] of Object.entries(workspace.apps)) {
-		if (app.type === 'frontend' && app.dependencies.includes(backendAppName)) {
+		if (
+			(app.type === 'web' || app.type === 'mobile') &&
+			app.dependencies.includes(backendAppName)
+		) {
 			dependentApps.push(appName);
 		}
 	}

package/src/workspace/index.ts

@@ -1,5 +1,6 @@
 import { basename } from 'node:path';
 import type { GkmConfig } from '../types.js';
+import { getPublicEnvPrefix } from './publicEnv.js';
 import {
 	formatValidationErrors,
 	safeValidateWorkspaceConfig,
@@ -17,6 +18,11 @@ import type {
 } from './types.js';
 import { isWorkspaceConfig } from './types.js';
 
+export {
+	getPublicEnvPrefix,
+	PUBLIC_ENV_PREFIXES,
+	stripPublicPrefix,
+} from './publicEnv.js';
 export {
 	formatValidationErrors,
 	getDeployTargetError,
@@ -105,7 +111,7 @@ function validateDependencies<TApps extends AppsRecord>(apps: TApps): void {
  *       logger: './src/logger',
  *     },
  *     web: {
- *       type: 'frontend',
+ *       type: 'web',
  *       framework: 'nextjs',
  *       path: 'apps/web',
  *       port: 3001,
@@ -350,7 +356,12 @@ export function getAppBuildOrder(workspace: NormalizedWorkspace): string[] {
 
 /**
  * Generate environment variables for app dependencies.
- * Each dependency gets both a `{DEP_NAME}_URL` and `NEXT_PUBLIC_{DEP_NAME}_URL` variable.
+ *
+ * Each dependency gets the un-prefixed `{DEP}_URL` (for server-side use) and,
+ * when the consuming app's framework supports a public-var prefix, also the
+ * prefixed form (e.g. `NEXT_PUBLIC_{DEP}_URL` for Next.js, `VITE_{DEP}_URL`
+ * for Vite/TanStack Start). The prefixed form is what gets bundled into the
+ * client at build time.
  */
 export function getDependencyEnvVars(
 	workspace: NormalizedWorkspace,
@@ -361,6 +372,7 @@ export function getDependencyEnvVars(
 	if (!app) return {};
 
 	const env: Record<string, string> = {};
+	const publicPrefix = getPublicEnvPrefix(app.framework);
 
 	for (const depName of app.dependencies) {
 		const dep = workspace.apps[depName];
@@ -368,7 +380,9 @@ export function getDependencyEnvVars(
 			const url = `${urlPrefix}:${dep.port}`;
 			const envKey = `${depName.toUpperCase()}_URL`;
 			env[envKey] = url;
-			env[`NEXT_PUBLIC_${envKey}`] = url;
+			if (publicPrefix) {
+				env[`${publicPrefix}${envKey}`] = url;
+			}
 		}
 	}
 

package/src/workspace/publicEnv.ts

@@ -0,0 +1,57 @@
+import type { Framework } from './types.js';
+
+/**
+ * All public env-var prefixes the toolbox understands.
+ *
+ * Used when resolving incoming var names back to a dependency
+ * (e.g. `VITE_AUTH_URL` → `auth`). A var matching any of these
+ * is considered safe to inline into a client bundle.
+ */
+export const PUBLIC_ENV_PREFIXES = [
+	'NEXT_PUBLIC_',
+	'VITE_',
+	'EXPO_PUBLIC_',
+] as const;
+
+/**
+ * Resolve the public env-var prefix that a frontend framework's bundler
+ * inlines into client code at build time:
+ *
+ *  - `nextjs`         → `NEXT_PUBLIC_`
+ *  - `vite`           → `VITE_`
+ *  - `tanstack-start` → `VITE_` (uses Vite under the hood)
+ *  - `expo`           → `EXPO_PUBLIC_`
+ *  - `remix`          → `''` (Remix exposes via loaders, no prefix convention)
+ *
+ * For backend frameworks or unspecified, falls back to `NEXT_PUBLIC_` to
+ * preserve the historical default. Backend apps never read these vars
+ * from a bundle, so the prefix only affects scaffolding/symmetry.
+ */
+export function getPublicEnvPrefix(framework?: Framework): string {
+	switch (framework) {
+		case 'vite':
+		case 'tanstack-start':
+			return 'VITE_';
+		case 'expo':
+			return 'EXPO_PUBLIC_';
+		case 'remix':
+			return '';
+		case 'nextjs':
+			return 'NEXT_PUBLIC_';
+		default:
+			return 'NEXT_PUBLIC_';
+	}
+}
+
+/**
+ * Strip a known public prefix from a var name.
+ * Returns the un-prefixed name, or `null` if no prefix matched.
+ */
+export function stripPublicPrefix(name: string): string | null {
+	for (const prefix of PUBLIC_ENV_PREFIXES) {
+		if (prefix && name.startsWith(prefix)) {
+			return name.slice(prefix.length);
+		}
+	}
+	return null;
+}