@geekmidas/cli 1.10.12 → 1.10.14

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @geekmidas/cli
 
+## 1.10.14
+
+### Patch Changes
+
+- 🐛 Fix smtp resolution ports
+
+## 1.10.13
+
+### Patch Changes
+
+- ✨ [`a2738e2`](https://github.com/geekmidas/toolbox/commit/a2738e23c47ab4291284d7c1abffb97f9665cfe5) Thanks [@geekmidas](https://github.com/geekmidas)! - Add mailpit credentails to reconsiliation
+
 ## 1.10.12
 
 ### Patch Changes

package/dist/index.cjs

@@ -35,7 +35,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.11";
+var version = "1.10.13";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -3064,8 +3064,8 @@ services:
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${imageName}}:\${SMTP_PASS:-${imageName}}
     ports:
-      - "\${MAILPIT_UI_PORT:-8025}:8025"  # Web UI
-      - "\${MAILPIT_SMTP_PORT:-1025}:1025"  # SMTP
+      - "\${MAILPIT_PORT:-8025}:8025"  # Web UI / API
+      - "\${SMTP_PORT:-1025}:1025"  # SMTP
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
       interval: 5s
@@ -3199,8 +3199,8 @@ services:
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${workspace.name}}:\${SMTP_PASS:-${workspace.name}}
     ports:
-      - "\${MAILPIT_UI_PORT:-8025}:8025"  # Web UI
-      - "\${MAILPIT_SMTP_PORT:-1025}:1025"  # SMTP
+      - "\${MAILPIT_PORT:-8025}:8025"  # Web UI / API
+      - "\${SMTP_PORT:-1025}:1025"  # SMTP
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
       interval: 5s
@@ -7219,10 +7219,32 @@ function generateDockerFiles(options, template, dbApps) {
     container_name: ${options.name}-mailpit
     restart: unless-stopped
     ports:
-      - '\${MAILPIT_SMTP_HOST_PORT:-1025}:1025'
-      - '\${MAILPIT_UI_HOST_PORT:-8025}:8025'
+      - '\${SMTP_PORT:-1025}:1025'
+      - '\${MAILPIT_PORT:-8025}:8025'
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${options.name}}:\${SMTP_PASS:-${options.name}}`);
+	if (options.services?.storage) {
+		services.push(`  minio:
+    image: minio/minio:latest
+    container_name: ${options.name}-minio
+    restart: unless-stopped
+    entrypoint: sh
+    command: -c 'mkdir -p /data/\${STORAGE_BUCKET:-${options.name}} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
+    environment:
+      MINIO_ROOT_USER: \${STORAGE_ACCESS_KEY_ID:-${options.name}}
+      MINIO_ROOT_PASSWORD: \${STORAGE_SECRET_ACCESS_KEY:-${options.name}}
+    ports:
+      - '\${MINIO_API_HOST_PORT:-9000}:9000'
+      - '\${MINIO_CONSOLE_HOST_PORT:-9001}:9001'
+    volumes:
+      - minio_data:/data
+    healthcheck:
+      test: ['CMD', 'mc', 'ready', 'local']
+      interval: 10s
+      timeout: 5s
+      retries: 5`);
+		volumes.push("  minio_data:");
+	}
 	let dockerCompose = `# Use "gkm dev" or "gkm test" to start services.
 # Running "docker compose up" directly will not inject secrets or resolve ports.
 services:
@@ -8780,6 +8802,11 @@ const servicesChoices = [
 		title: "Mailpit",
 		value: "mail",
 		description: "Email testing service (dev only)"
+	},
+	{
+		title: "MinIO",
+		value: "storage",
+		description: "S3-compatible object storage (dev only)"
 	}
 ];
 /**
@@ -10949,12 +10976,14 @@ async function initCommand(projectName, options = {}) {
 	const servicesArray = options.yes ? [
 		"db",
 		"cache",
-		"mail"
+		"mail",
+		"storage"
 	] : answers.services || [];
 	const services = {
 		db: servicesArray.includes("db"),
 		cache: servicesArray.includes("cache"),
-		mail: servicesArray.includes("mail")
+		mail: servicesArray.includes("mail"),
+		storage: servicesArray.includes("storage")
 	};
 	const pkgManager = options.pm ? options.pm : options.yes ? "pnpm" : answers.packageManager ?? detectedPkgManager;
 	const deployTarget = options.yes ? "dokploy" : answers.deployTarget ?? "dokploy";
@@ -11459,6 +11488,10 @@ function reconcileSecrets(secrets, workspace) {
 		{
 			key: "storage",
 			name: "minio"
+		},
+		{
+			key: "mail",
+			name: "mailpit"
 		}
 	];
 	for (const { key, name: name$1 } of serviceMap) if (workspace.services[key] && !result.services[name$1]) {
@@ -11509,6 +11542,7 @@ async function generateFreshSecrets(stage, workspace, options) {
 	if (workspace.services.db) serviceNames.push("postgres");
 	if (workspace.services.cache) serviceNames.push("redis");
 	if (workspace.services.storage) serviceNames.push("minio");
+	if (workspace.services.mail) serviceNames.push("mailpit");
 	const secrets = require_fullstack_secrets.createStageSecrets(stage, serviceNames, { projectName: workspace.name });
 	const isMultiApp = Object.keys(workspace.apps).length > 1;
 	if (isMultiApp) {
@@ -11611,6 +11645,16 @@ async function testCommand(options = {}) {
 			if (resolvedPorts.mappings.length > 0) {
 				secretsEnv = rewriteUrlsWithPorts(secretsEnv, resolvedPorts);
 				console.log(`  🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`);
+			} else {
+				const ports = await loadPortState(cwd);
+				if (Object.keys(ports).length > 0) {
+					secretsEnv = rewriteUrlsWithPorts(secretsEnv, {
+						dockerEnv: {},
+						ports,
+						mappings
+					});
+					console.log(`  🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
+				}
 			}
 		}
 	}