@geekmidas/cli 1.10.13 → 1.10.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/index.cjs +7 -7
  3. package/dist/index.cjs.map +1 -1
  4. package/dist/index.mjs +7 -7
  5. package/dist/index.mjs.map +1 -1
  6. package/package.json +3 -3
  7. package/src/dev/__tests__/index.spec.ts +4 -4
  8. package/src/docker/__tests__/compose.spec.ts +2 -2
  9. package/src/docker/compose.ts +4 -4
  10. package/src/init/__tests__/generators.spec.ts +2 -4
  11. package/src/init/generators/docker.ts +2 -2
  12. package/src/test/__tests__/__fixtures__/workspace.ts +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geekmidas/cli",
3
- "version": "1.10.13",
3
+ "version": "1.10.14",
4
4
  "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
5
5
  "private": false,
6
6
  "type": "module",
@@ -57,10 +57,10 @@
57
57
  "tsx": "~4.20.3",
58
58
  "yaml": "~2.8.2",
59
59
  "@geekmidas/constructs": "~3.0.2",
60
- "@geekmidas/logger": "~1.0.0",
61
60
  "@geekmidas/envkit": "~1.0.3",
62
61
  "@geekmidas/errors": "~1.0.0",
63
- "@geekmidas/schema": "~1.0.0"
62
+ "@geekmidas/schema": "~1.0.0",
63
+ "@geekmidas/logger": "~1.0.0"
64
64
  },
65
65
  "devDependencies": {
66
66
  "@types/lodash.kebabcase": "^4.1.9",
package/src/dev/__tests__/index.spec.ts CHANGED
@@ -1467,8 +1467,8 @@ services:
1467
1467
  mailpit:
1468
1468
  image: axllent/mailpit
1469
1469
  ports:
1470
- - '\${MAILPIT_SMTP_PORT:-1025}:1025'
1471
- - '\${MAILPIT_UI_PORT:-8025}:8025'
1470
+ - '\${SMTP_PORT:-1025}:1025'
1471
+ - '\${MAILPIT_PORT:-8025}:8025'
1472
1472
  `,
1473
1473
  );
1474
1474
 
@@ -1488,13 +1488,13 @@ services:
1488
1488
  },
1489
1489
  {
1490
1490
  service: 'mailpit',
1491
- envVar: 'MAILPIT_SMTP_PORT',
1491
+ envVar: 'SMTP_PORT',
1492
1492
  defaultPort: 1025,
1493
1493
  containerPort: 1025,
1494
1494
  },
1495
1495
  {
1496
1496
  service: 'mailpit',
1497
- envVar: 'MAILPIT_UI_PORT',
1497
+ envVar: 'MAILPIT_PORT',
1498
1498
  defaultPort: 8025,
1499
1499
  containerPort: 8025,
1500
1500
  },
package/src/docker/__tests__/compose.spec.ts CHANGED
@@ -946,8 +946,8 @@ describe('generateWorkspaceCompose', () => {
946
946
  expect(yaml).toContain('mailpit:');
947
947
  expect(yaml).toContain('image: axllent/mailpit:latest');
948
948
  expect(yaml).toContain('MP_SMTP_AUTH:');
949
- expect(yaml).toContain('${MAILPIT_UI_PORT:-8025}:8025'); // Web UI
950
- expect(yaml).toContain('${MAILPIT_SMTP_PORT:-1025}:1025'); // SMTP
949
+ expect(yaml).toContain('${MAILPIT_PORT:-8025}:8025'); // Web UI / API
950
+ expect(yaml).toContain('${SMTP_PORT:-1025}:1025'); // SMTP
951
951
  });
952
952
 
953
953
  it('should add SMTP env vars for backend apps when mail is enabled', () => {
package/src/docker/compose.ts CHANGED
@@ -269,8 +269,8 @@ services:
269
269
  environment:
270
270
  MP_SMTP_AUTH: \${SMTP_USER:-${imageName}}:\${SMTP_PASS:-${imageName}}
271
271
  ports:
272
- - "\${MAILPIT_UI_PORT:-8025}:8025" # Web UI
273
- - "\${MAILPIT_SMTP_PORT:-1025}:1025" # SMTP
272
+ - "\${MAILPIT_PORT:-8025}:8025" # Web UI / API
273
+ - "\${SMTP_PORT:-1025}:1025" # SMTP
274
274
  healthcheck:
275
275
  test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
276
276
  interval: 5s
@@ -457,8 +457,8 @@ services:
457
457
  environment:
458
458
  MP_SMTP_AUTH: \${SMTP_USER:-${workspace.name}}:\${SMTP_PASS:-${workspace.name}}
459
459
  ports:
460
- - "\${MAILPIT_UI_PORT:-8025}:8025" # Web UI
461
- - "\${MAILPIT_SMTP_PORT:-1025}:1025" # SMTP
460
+ - "\${MAILPIT_PORT:-8025}:8025" # Web UI / API
461
+ - "\${SMTP_PORT:-1025}:1025" # SMTP
462
462
  healthcheck:
463
463
  test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
464
464
  interval: 5s
package/src/init/__tests__/generators.spec.ts CHANGED
@@ -249,10 +249,8 @@ describe('generateDockerFiles', () => {
249
249
  };
250
250
  const files = generateDockerFiles(options, minimalTemplate);
251
251
  expect(files[0].content).toContain('mailpit');
252
- expect(files[0].content).toContain(
253
- "'${MAILPIT_SMTP_HOST_PORT:-1025}:1025'",
254
- );
255
- expect(files[0].content).toContain("'${MAILPIT_UI_HOST_PORT:-8025}:8025'");
252
+ expect(files[0].content).toContain("'${SMTP_PORT:-1025}:1025'");
253
+ expect(files[0].content).toContain("'${MAILPIT_PORT:-8025}:8025'");
256
254
  expect(files[0].content).toContain('MP_SMTP_AUTH:');
257
255
  });
258
256
 
package/src/init/generators/docker.ts CHANGED
@@ -153,8 +153,8 @@ export function generateDockerFiles(
153
153
  container_name: ${options.name}-mailpit
154
154
  restart: unless-stopped
155
155
  ports:
156
- - '\${MAILPIT_SMTP_HOST_PORT:-1025}:1025'
157
- - '\${MAILPIT_UI_HOST_PORT:-8025}:8025'
156
+ - '\${SMTP_PORT:-1025}:1025'
157
+ - '\${MAILPIT_PORT:-8025}:8025'
158
158
  environment:
159
159
  MP_SMTP_AUTH: \${SMTP_USER:-${options.name}}:\${SMTP_PASS:-${options.name}}`);
160
160
  }
package/src/test/__tests__/__fixtures__/workspace.ts CHANGED
@@ -99,6 +99,6 @@ services:
99
99
  mailpit:
100
100
  image: axllent/mailpit
101
101
  ports:
102
- - '\${MAILPIT_SMTP_PORT:-1025}:1025'
103
- - '\${MAILPIT_UI_PORT:-8025}:8025'
102
+ - '\${SMTP_PORT:-1025}:1025'
103
+ - '\${MAILPIT_PORT:-8025}:8025'
104
104
  `;