nodemailer 8.0.5 → 8.0.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## [8.0.7](https://github.com/nodemailer/nodemailer/compare/v8.0.6...v8.0.7) (2026-04-27)
+
+
+### Bug Fixes
+
+* keep domain as UTF-8 when local part is non-ASCII ([#1814](https://github.com/nodemailer/nodemailer/issues/1814)) ([66d4ecb](https://github.com/nodemailer/nodemailer/commit/66d4ecb5aa431f3614a26b3c08b9c63cdf32a9ea))
+
+## [8.0.6](https://github.com/nodemailer/nodemailer/compare/v8.0.5...v8.0.6) (2026-04-24)
+
+
+### Bug Fixes
+
+* restore base64 wrap() trim behavior to prevent trailing CRLF ([#1810](https://github.com/nodemailer/nodemailer/issues/1810)) ([#1811](https://github.com/nodemailer/nodemailer/issues/1811)) ([b1ae6c1](https://github.com/nodemailer/nodemailer/commit/b1ae6c1c2927240737d9f68f316f0c84042b8adb))
+
 ## [8.0.5](https://github.com/nodemailer/nodemailer/compare/v8.0.4...v8.0.5) (2026-04-07)
 
 

package/lib/base64/index.js

@@ -36,12 +36,12 @@ function wrap(str, lineLength) {
     const chunkLength = lineLength * 1024;
     const wrapRegex = new RegExp('.{' + lineLength + '}', 'g');
     while (pos < str.length) {
-        const wrappedLines = str.substr(pos, chunkLength).replace(wrapRegex, '$&\r\n');
+        const wrappedLines = str.substr(pos, chunkLength).replace(wrapRegex, '$&\r\n').trim();
         result.push(wrappedLines);
         pos += chunkLength;
     }
 
-    return result.join('');
+    return result.join('\r\n').trim();
 }
 
 /**
@@ -95,20 +95,17 @@ class Encoder extends Transform {
         if (this.options.lineLength) {
             b64 = wrap(b64, this.options.lineLength);
 
+            // remove last line as it is still most probably incomplete
             const lastLF = b64.lastIndexOf('\n');
             if (lastLF < 0) {
                 this._curLine = b64;
                 b64 = '';
+            } else if (lastLF === b64.length - 1) {
+                this._curLine = '';
             } else {
                 this._curLine = b64.substring(lastLF + 1);
                 b64 = b64.substring(0, lastLF + 1);
-
-                if (b64 && !b64.endsWith('\r\n')) {
-                    b64 += '\r\n';
-                }
             }
-        } else {
-            this._curLine = '';
         }
 
         if (b64) {
@@ -125,6 +122,7 @@ class Encoder extends Transform {
         }
 
         if (this._curLine) {
+            this._curLine = wrap(this._curLine, this.options.lineLength);
             this.outputBytes += this._curLine.length;
             this.push(Buffer.from(this._curLine, 'ascii'));
             this._curLine = '';

package/lib/mime-node/index.js

@@ -1225,17 +1225,21 @@ class MimeNode {
         let user = address.substr(0, lastAt);
         const domain = address.substr(lastAt + 1);
 
-        // Usernames are not touched and are kept as is even if these include unicode
-        // Domains are punycoded by default
-        // 'jõgeva.ee' will be converted to 'xn--jgeva-dua.ee'
-        // non-unicode domains are left as is
+        // Usernames are not touched and are kept as is even if these include unicode.
+        // Domains are punycoded when the local part is ASCII ('safe@jõgeva.ee' -> 'safe@xn--jgeva-dua.ee').
+        // When the local part contains non-ASCII bytes the address already requires SMTPUTF8,
+        // so the domain is kept (or decoded back) as UTF-8 for symmetry on both sides of '@'.
 
-        let encodedDomain;
+        let encodedDomain = domain;
 
         try {
-            encodedDomain = punycode.toASCII(domain.toLowerCase());
+            if (/[\x80-\uFFFF]/.test(user)) {
+                encodedDomain = punycode.toUnicode(domain.toLowerCase());
+            } else {
+                encodedDomain = punycode.toASCII(domain.toLowerCase());
+            }
         } catch (_err) {
-            // keep as is?
+            // keep domain as supplied
         }
 
         if (user.indexOf(' ') >= 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "8.0.5",
+    "version": "8.0.7",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -27,20 +27,19 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-sesv2": "3.1025.0",
+        "@aws-sdk/client-sesv2": "3.1037.0",
         "bunyan": "1.8.15",
         "c8": "11.0.0",
-        "eslint": "10.2.0",
+        "eslint": "10.2.1",
         "eslint-config-prettier": "10.1.8",
-        "globals": "17.4.0",
+        "globals": "17.5.0",
         "libbase64": "1.3.0",
-        "libmime": "5.3.7",
+        "libmime": "5.3.8",
         "libqp": "2.1.1",
-        "nodemailer-ntlm-auth": "1.0.4",
-        "prettier": "3.8.1",
+        "prettier": "3.8.3",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "smtp-server": "3.18.3"
+        "smtp-server": "3.18.4"
     },
     "engines": {
         "node": ">=6.0.0"