Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adonisjs/mail
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v8.1.2
Choose a base ref
...
head repository: adonisjs/mail
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v8.2.0
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on May 2, 2023

  1. fix: allow multiple addressed in replyTo (#82) 

    * fix: allow multiple addressed in replyTo

* chore: update nodemailer version

* test: add test case for multiple replyTo
    @mastermunj
    mastermunj authored May 2, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    timfish Tim Fish
    GPG key ID: 09931B3A51829714
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd6fa7e View commit details

Commits on May 4, 2023

  1. chore: update dependencies

    @Julien-R44
    Julien-R44 committed May 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    da531e8 View commit details

  2. chore: update major for luxon and ical-generator

    @Julien-R44
    Julien-R44 committed May 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e108ba View commit details

  3. chore(release): 8.2.0

    @Julien-R44
    Julien-R44 committed May 4, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0873da9 View commit details
Showing with 52 additions and 33 deletions.
  1. +1 −1 adonis-typings/mail.ts
  2. +31 −29 package.json
  3. +2 −1 src/Message/index.ts
  4. +18 −2 test/message.spec.ts
2 changes: 1 addition & 1 deletion adonis-typings/mail.ts
View file
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ declare module '@ioc:Adonis/Addons/Mail' {
bcc?: RecipientNode[]
messageId?: string
subject?: string
replyTo?: RecipientNode
replyTo?: RecipientNode[]
inReplyTo?: string
references?: string[]
encoding?: string
60 changes: 31 additions & 29 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adonisjs/mail",
"version": "8.1.2",
"version": "8.2.0",
"description": "Mail provider for adonis framework and has support for all common mailing services to send emails",
"main": "build/providers/MailProvider.js",
"exports": {
@@ -33,6 +33,7 @@
"mrm": "mrm --preset=@adonisjs/mrm-preset",
"pretest": "npm run lint",
"test": "node -r @adonisjs/require-ts/build/register bin/test.ts",
"quick:test": "node -r @adonisjs/require-ts/build/register bin/test.ts",
"clean": "del-cli build",
"copyfiles": "copyfiles \"templates/**/*.txt\" \"instructions.md\" build",
"compile": "npm run lint && npm run clean && tsc",
@@ -53,35 +54,36 @@
"author": "virk",
"license": "MIT",
"devDependencies": {
"@adonisjs/core": "^5.7.3",
"@adonisjs/core": "^5.9.0",
"@adonisjs/mrm-preset": "^5.0.3",
"@adonisjs/repl": "^3.1.10",
"@adonisjs/require-ts": "^2.0.11",
"@adonisjs/sink": "^5.2.2",
"@adonisjs/view": "^6.1.3",
"@japa/assert": "^1.3.4",
"@japa/run-failed-tests": "^1.0.7",
"@japa/runner": "^2.0.7",
"@japa/spec-reporter": "^1.1.12",
"@adonisjs/repl": "^3.1.11",
"@adonisjs/require-ts": "^2.0.13",
"@adonisjs/sink": "^5.4.3",
"@adonisjs/view": "^6.2.0",
"@japa/assert": "^1.4.1",
"@japa/run-failed-tests": "^1.1.1",
"@japa/runner": "^2.5.1",
"@japa/spec-reporter": "^1.3.3",
"@poppinss/dev-utils": "^2.0.3",
"@types/node": "^17.0.23",
"@types/luxon": "^3.3.0",
"@types/node": "^18.16.3",
"aws-sdk": "^2.1111.0",
"commitizen": "^4.2.4",
"commitizen": "^4.3.0",
"copyfiles": "^2.4.1",
"cz-conventional-changelog": "^3.3.0",
"del-cli": "^4.0.1",
"dotenv": "^16.0.0",
"eslint": "^8.13.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-adonis": "^2.1.0",
"eslint-plugin-prettier": "^4.0.0",
"github-label-sync": "^2.2.0",
"husky": "^7.0.4",
"luxon": "^2.3.1",
"mrm": "^4.0.0",
"np": "^7.6.1",
"prettier": "^2.6.2",
"typescript": "^4.6.3"
"del-cli": "^5.0.0",
"dotenv": "^16.0.3",
"eslint": "^8.39.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-adonis": "^2.1.1",
"eslint-plugin-prettier": "^4.2.1",
"github-label-sync": "^2.3.1",
"husky": "^8.0.3",
"luxon": "^3.3.0",
"mrm": "^4.1.14",
"np": "^7.7.0",
"prettier": "^2.8.8",
"typescript": "^5.0.4"
},
"config": {
"commitizen": {
@@ -93,15 +95,15 @@
"@adonisjs/view": "^6.0.0"
},
"dependencies": {
"@poppinss/colors": "^3.0.2",
"@poppinss/colors": "^3.0.3",
"@poppinss/manager": "^5.0.2",
"@poppinss/utils": "^4.0.4",
"fastq": "^1.13.0",
"fastq": "^1.15.0",
"get-stream": "^6.0.1",
"got": "^11.8.2",
"ical-generator": "^3.4.1",
"ical-generator": "^4.0.0",
"multi-part": "^3.0.0",
"nodemailer": "^6.7.3"
"nodemailer": "^6.9.1"
},
"repository": {
"type": "git",
3 changes: 2 additions & 1 deletion src/Message/index.ts
View file
Original file line number Diff line number Diff line change
@@ -108,7 +108,8 @@ export class Message implements MessageContract {
* Define replyTo email and name
*/
public replyTo(address: string, name?: string): this {
this.nodeMailerMessage.replyTo = this.getAddress(address, name)
this.nodeMailerMessage.replyTo = this.nodeMailerMessage.replyTo || []
this.nodeMailerMessage.replyTo.push(this.getAddress(address, name))
return this
}

20 changes: 18 additions & 2 deletions test/message.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -75,13 +75,27 @@ test.group('Message', () => {
test('define replyTo', ({ assert }) => {
const message = new Message()
message.replyTo('foo@bar.com')
assert.deepEqual(message.toJSON().message, { replyTo: { address: 'foo@bar.com' } })
assert.deepEqual(message.toJSON().message, { replyTo: [{ address: 'foo@bar.com' }] })
})

test('define replyTo with name', ({ assert }) => {
const message = new Message()
message.replyTo('foo@bar.com', 'Foo')
assert.deepEqual(message.toJSON().message, { replyTo: { address: 'foo@bar.com', name: 'Foo' } })
assert.deepEqual(message.toJSON().message, {
replyTo: [{ address: 'foo@bar.com', name: 'Foo' }],
})
})

test('define multiple replyTo with name', ({ assert }) => {
const message = new Message()
message.replyTo('foo@bar.com', 'Foo')
message.replyTo('foo@baz.com', 'FooBaz')
assert.deepEqual(message.toJSON().message, {
replyTo: [
{ address: 'foo@bar.com', name: 'Foo' },
{ address: 'foo@baz.com', name: 'FooBaz' },
],
})
})

test('define in reply to messageId', ({ assert }) => {
@@ -285,7 +299,9 @@ test.group('Message', () => {
(calendar) => {
calendar.createEvent({
summary: 'Discuss tech',
// @ts-expect-error See https://github.com/sebbo2002/ical-generator/issues/485
start: DateTime.local().plus({ minutes: 30 }),
// @ts-expect-error See https://github.com/sebbo2002/ical-generator/issues/485
end: DateTime.local().plus({ minutes: 60 }),
url: 'http://adonisjs.com/meeting/1',
})