v6.4.17

nodemailer · Dec 11, 2020 · 6e045d1 · 6e045d1
1 parent ba31c64
commit 6e045d1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 6.4.17 2020-12-11
+
+-   Allow mixing attachments with caendar alternatives
+
+## 6.4.16 2020-11-12
+
+-   Applied updated prettier formating rules
+
 ## 6.4.15 2020-11-06
 
 -   Minor changes in header key casing

diff --git a/lib/mail-composer/index.js b/lib/mail-composer/index.js
@@ -230,9 +230,8 @@ class MailComposer {
             amp.contentType = 'text/x-amp-html; charset=utf-8';
         }
 
-        // only include the calendar alternative if there are no attachments
-        // otherwise you might end up in a blank screen on some clients
-        if (this.mail.icalEvent && !(this.mail.attachments && this.mail.attachments.length)) {
+        // NB! when including attachments with a calendar alternative you might end up in a blank screen on some clients
+        if (this.mail.icalEvent) {
             if (
                 typeof this.mail.icalEvent === 'object' &&
                 (this.mail.icalEvent.content || this.mail.icalEvent.path || this.mail.icalEvent.href || this.mail.icalEvent.raw)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.4.16",
+    "version": "6.4.17",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,7 +23,7 @@
         "bunyan": "1.8.14",
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "6.15.0",
+        "eslint-config-prettier": "7.0.0",
         "grunt": "1.3.0",
         "grunt-cli": "1.3.2",
         "grunt-eslint": "23.0.0",
@@ -36,7 +36,7 @@
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
         "sinon": "9.2.1",
-        "smtp-server": "3.7.0"
+        "smtp-server": "3.8.0"
     },
     "engines": {
         "node": ">=6.0.0"

diff --git a/test/mail-composer/mail-composer-test.js b/test/mail-composer/mail-composer-test.js
@@ -413,6 +413,8 @@ describe('MailComposer unit tests', function () {
                 '----_NmP-test-Part_2\r\n' +
                 'rawhtml\r\n' +
                 '----_NmP-test-Part_2\r\n' +
+                'rawcalendar\r\n' +
+                '----_NmP-test-Part_2\r\n' +
                 'rawalternative\r\n' +
                 '----_NmP-test-Part_2--\r\n' +
                 '\r\n' +