Skip to content

Commit

Permalink
Merge pull request #61 from AthennaIO/develop
Browse files Browse the repository at this point in the history
refactor(view): render view asynchronous
  • Loading branch information
jlenon7 authored May 18, 2024
2 parents d46b7d7 + a99913c commit 47a1e0b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/mail",
"version": "4.20.0",
"version": "4.21.0",
"description": "The Athenna email handler. Built on top of nodemailer.",
"license": "MIT",
"author": "Victor Tesoura Júnior <[email protected]>",
Expand Down
18 changes: 17 additions & 1 deletion src/drivers/SmtpDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,22 @@ export class SmtpDriver extends Driver {
* Send a new mail message.
*/
public async send(): Promise<any> {
if (this.message.text) {
this.message.text = await Promise.resolve(this.message.text)
}

if (this.message.html) {
this.message.html = await Promise.resolve(this.message.html)
}

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (this.message.markdown) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
this.message.markdown = await Promise.resolve(this.message.markdown)
}

return this.transport.sendMail(this.message)
}

Expand Down Expand Up @@ -491,7 +507,7 @@ export class SmtpDriver extends Driver {
public view(name: string, data: any = {}, options: ContentOptions = {}) {
options = Options.create(options, { type: 'html' })

this.message[options.type] = View.renderSync(name, {
this.message[options.type] = View.render(name, {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
content: this.message.text || this.message.html || this.message.markdown,
Expand Down

0 comments on commit 47a1e0b

Please sign in to comment.