@travetto/email-compiler 5.0.0-rc.2 → 5.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "5.0.0-rc.2",
+  "version": "5.0.0-rc.4",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,12 +26,12 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/runtime": "^5.0.0-rc.2",
-    "@travetto/config": "^5.0.0-rc.2",
-    "@travetto/di": "^5.0.0-rc.2",
-    "@travetto/email": "^5.0.0-rc.2",
-    "@travetto/image": "^5.0.0-rc.2",
-    "@travetto/worker": "^5.0.0-rc.2",
+    "@travetto/runtime": "^5.0.0-rc.4",
+    "@travetto/config": "^5.0.0-rc.4",
+    "@travetto/di": "^5.0.0-rc.4",
+    "@travetto/email": "^5.0.0-rc.4",
+    "@travetto/image": "^5.0.0-rc.4",
+    "@travetto/worker": "^5.0.0-rc.4",
     "@types/inline-css": "^3.0.3",
     "html-entities": "^2.5.2",
     "inline-css": "^4.0.2",
@@ -39,7 +39,7 @@
     "sass": "^1.77.6"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.2"
+    "@travetto/cli": "^5.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/send.ts

@@ -1,4 +1,4 @@
-import { MailService, EmailOptions, SentEmail } from '@travetto/email';
+import { MailService, EmailOptions } from '@travetto/email';
 import { MailTransportTarget } from '@travetto/email/src/internal/types';
 import { DependencyRegistry, Injectable } from '@travetto/di';
 
@@ -45,13 +45,19 @@ export class EditorSendService {
     try {
       console.log('Sending email', { to });
       const svc = await this.service();
-      const info = await svc.send<{ host?: string } & SentEmail>(message);
-      console.log('Sent email', { to });
-
-      return this.ethereal ? {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-        url: (await import('nodemailer')).getTestMessageUrl(info as any)
-      } : {};
+      if (this.ethereal) {
+        const { getTestMessageUrl } = await import('nodemailer');
+        const { default: smtp } = await import('nodemailer/lib/smtp-transport/index');
+        type SendMessage = Parameters<Parameters<(typeof smtp)['prototype']['send']>[1]>[1];
+        const info = await svc.send<SendMessage>(message);
+        const url = getTestMessageUrl(info);
+        console.log('Sent email', { to, url });
+        return { url };
+      } else {
+        await svc.send(message);
+        console.log('Sent email', { to });
+        return {};
+      }
     } catch (err) {
       console.warn('Failed to send email', { to, error: err });
       throw err;

package/support/cli.email_editor.ts

@@ -6,7 +6,7 @@ import { DependencyRegistry } from '@travetto/di';
 import { EditorService } from './bin/editor';
 
 /** The email editor compilation service and output serving */
-@CliCommand({ addEnv: true })
+@CliCommand({ with: { env: true } })
 export class EmailEditorCommand {
 
   preMain(): void {

package/support/cli.email_test.ts

@@ -10,7 +10,7 @@ import { EditorService } from './bin/editor';
 /**
  * CLI Entry point for running the email server
  */
-@CliCommand({ addEnv: true })
+@CliCommand({ with: { env: true } })
 export class EmailTestCommand implements CliCommandShape {
 
   preMain(): void {