@nestjs-modules/mailer 1.8.1 → 1.10.3

package/.nvmrc

@@ -0,0 +1 @@
+v20.10.0

package/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.10.3](https://github.com/nest-modules/mailer/compare/v1.10.2...v1.10.3) (2023-12-20)
+
+
+### Bug Fixes
+
+* add tslib ([36f3aca](https://github.com/nest-modules/mailer/commit/36f3aca0ffac5943fa1dcd927cce7200dbcdb8df))
+
+### [1.10.2](https://github.com/nest-modules/mailer/compare/v1.10.0...v1.10.2) (2023-12-20)
+
+
+### Bug Fixes
+
+* allows you to handle peer dependencies greater than or equal to ([9885780](https://github.com/nest-modules/mailer/commit/988578099fe9975ca96c3e245bfc1b709d9be28a))
+
+### [1.10.1](https://github.com/nest-modules/mailer/compare/v1.10.0...v1.10.1) (2023-12-20)
+
+
+### Bug Fixes
+
+* allows you to handle peer dependencies greater than or equal to ([9885780](https://github.com/nest-modules/mailer/commit/988578099fe9975ca96c3e245bfc1b709d9be28a))
+
+## [1.10.0](https://github.com/nest-modules/mailer/compare/v1.9.1...v1.10.0) (2023-12-20)
+
+### [1.9.1](https://github.com/nest-modules/mailer/compare/v1.9.0...v1.9.1) (2023-07-20)
+
+
+### Bug Fixes
+
+* patch vm2 Sandbox Escape vulnerability ([0f89a36](https://github.com/nest-modules/mailer/commit/0f89a36bd8c18cb349cb826ac840fdf3d6aad252))
+
+## [1.9.0](https://github.com/nest-modules/mailer/compare/v1.8.1...v1.9.0) (2023-07-20)
+
+
+### Bug Fixes
+
+* fix partial not found error on Windows ([fb1fcda](https://github.com/nest-modules/mailer/commit/fb1fcdaba04c4b4f6ccbf2492dc0f34565b198e1))
+* mjml import statement ([00abe2b](https://github.com/nest-modules/mailer/commit/00abe2b3215a41407fafbc134a56d97cb0b2ded8))
+* update dependencies by newer version ([f1d4fba](https://github.com/nest-modules/mailer/commit/f1d4fba6b9d8a0cc50ffe2ae1e3439552e327d0b))
+
+### [1.8.2](https://github.com/nest-modules/mailer/compare/v1.8.1...v1.8.2) (2022-12-22)
+
+
+### Bug Fixes
+
+* update dependencies by newer version ([f1d4fba](https://github.com/nest-modules/mailer/commit/f1d4fba6b9d8a0cc50ffe2ae1e3439552e327d0b))
+
 ### [1.8.1](https://github.com/nest-modules/mailer/compare/v1.8.0...v1.8.1) (2022-07-21)
 
 

package/dist/adapters/ejs.adapter.js

@@ -5,24 +5,28 @@ const ejs_1 = require("ejs");
 const lodash_1 = require("lodash");
 const fs = require("fs");
 const path = require("path");
-const inlineCss = require("inline-css");
+const css_inline_1 = require("css-inline");
 class EjsAdapter {
     constructor(config) {
         this.precompiledTemplates = {};
         this.config = {
-            inlineCssOptions: { url: ' ' },
+            inlineCssOptions: {},
             inlineCssEnabled: true,
         };
         Object.assign(this.config, config);
     }
     compile(mail, callback, mailerOptions) {
         const { context, template } = mail.data;
+        const templateBaseDir = (0, lodash_1.get)(mailerOptions, 'template.dir', '');
         const templateExt = path.extname(template) || '.ejs';
-        const templateName = path.basename(template, path.extname(template));
+        let templateName = path.basename(template, path.extname(template));
         const templateDir = path.isAbsolute(template)
             ? path.dirname(template)
-            : path.join((0, lodash_1.get)(mailerOptions, 'template.dir', ''), path.dirname(template));
+            : path.join(templateBaseDir, path.dirname(template));
         const templatePath = path.join(templateDir, templateName + templateExt);
+        templateName = path
+            .relative(templateBaseDir, templatePath)
+            .replace(templateExt, '');
         if (!this.precompiledTemplates[templateName]) {
             try {
                 const template = fs.readFileSync(templatePath, 'utf-8');
@@ -35,17 +39,15 @@ class EjsAdapter {
         const rendered = this.precompiledTemplates[templateName](context);
         const render = (html) => {
             if (this.config.inlineCssEnabled) {
-                inlineCss(html, this.config.inlineCssOptions)
-                    .then((html) => {
-                    mail.data.html = html;
-                    return callback();
-                })
-                    .catch(callback);
+                try {
+                    mail.data.html = (0, css_inline_1.inline)(html, this.config.inlineCssOptions);
+                }
+                catch (e) { }
             }
             else {
                 mail.data.html = html;
-                return callback();
             }
+            return callback();
         };
         if (typeof rendered === 'string') {
             render(rendered);

package/dist/adapters/handlebars.adapter.js

@@ -4,14 +4,14 @@ exports.HandlebarsAdapter = void 0;
 const fs = require("fs");
 const path = require("path");
 const handlebars = require("handlebars");
-const inlineCss = require("inline-css");
+const css_inline_1 = require("css-inline");
 const glob = require("glob");
 const lodash_1 = require("lodash");
 class HandlebarsAdapter {
     constructor(helpers, config) {
         this.precompiledTemplates = {};
         this.config = {
-            inlineCssOptions: { url: ' ' },
+            inlineCssOptions: {},
             inlineCssEnabled: true,
         };
         handlebars.registerHelper('concat', (...args) => {
@@ -23,12 +23,16 @@ class HandlebarsAdapter {
     }
     compile(mail, callback, mailerOptions) {
         const precompile = (template, callback, options) => {
+            const templateBaseDir = (0, lodash_1.get)(options, 'dir', '');
             const templateExt = path.extname(template) || '.hbs';
-            const templateName = path.basename(template, path.extname(template));
+            let templateName = path.basename(template, path.extname(template));
             const templateDir = path.isAbsolute(template)
                 ? path.dirname(template)
-                : path.join((0, lodash_1.get)(options, 'dir', ''), path.dirname(template));
+                : path.join(templateBaseDir, path.dirname(template));
             const templatePath = path.join(templateDir, templateName + templateExt);
+            templateName = path
+                .relative(templateBaseDir, templatePath)
+                .replace(templateExt, '');
             if (!this.precompiledTemplates[templateName]) {
                 try {
                     const template = fs.readFileSync(templatePath, 'utf-8');
@@ -51,7 +55,10 @@ class HandlebarsAdapter {
             data: {},
         });
         if (runtimeOptions.partials) {
-            const files = glob.sync(path.join(runtimeOptions.partials.dir, '**', '*.hbs'));
+            const partialPath = path
+                .join(runtimeOptions.partials.dir, '**', '*.hbs')
+                .replace(/\\/g, '/');
+            const files = glob.sync(partialPath);
             files.forEach((file) => {
                 const { templateName, templatePath } = precompile(file, () => { }, runtimeOptions.partials);
                 const templateDir = path.relative(runtimeOptions.partials.dir, path.dirname(templatePath));
@@ -60,17 +67,15 @@ class HandlebarsAdapter {
         }
         const rendered = this.precompiledTemplates[templateName](mail.data.context, Object.assign(Object.assign({}, runtimeOptions), { partials: this.precompiledTemplates }));
         if (this.config.inlineCssEnabled) {
-            inlineCss(rendered, this.config.inlineCssOptions)
-                .then((html) => {
-                mail.data.html = html;
-                return callback();
-            })
-                .catch(callback);
+            try {
+                mail.data.html = (0, css_inline_1.inline)(rendered, this.config.inlineCssOptions);
+            }
+            catch (e) { }
         }
         else {
             mail.data.html = rendered;
-            return callback();
         }
+        return callback();
     }
 }
 exports.HandlebarsAdapter = HandlebarsAdapter;

package/dist/adapters/mjml.adapter.js

@@ -4,7 +4,7 @@ exports.MjmlAdapter = void 0;
 const handlebars_adapter_1 = require("./handlebars.adapter");
 const ejs_adapter_1 = require("./ejs.adapter");
 const pug_adapter_1 = require("./pug.adapter");
-const mjml_1 = require("mjml");
+const mjml2html = require("mjml");
 class MjmlAdapter {
     constructor(engine, config, others) {
         this.engine = engine;
@@ -26,7 +26,7 @@ class MjmlAdapter {
     compile(mail, callback, mailerOptions) {
         var _a;
         (_a = this === null || this === void 0 ? void 0 : this.engine) === null || _a === void 0 ? void 0 : _a.compile(mail, () => {
-            mail.data.html = (0, mjml_1.default)(mail.data.html).html;
+            mail.data.html = mjml2html(mail.data.html).html;
             callback();
         }, mailerOptions);
     }

package/dist/adapters/pug.adapter.js

@@ -4,11 +4,11 @@ exports.PugAdapter = void 0;
 const path = require("path");
 const lodash_1 = require("lodash");
 const pug_1 = require("pug");
-const inlineCss = require("inline-css");
+const css_inline_1 = require("css-inline");
 class PugAdapter {
     constructor(config) {
         this.config = {
-            inlineCssOptions: { url: ' ' },
+            inlineCssOptions: {},
             inlineCssEnabled: true,
         };
         Object.assign(this.config, config);
@@ -27,17 +27,15 @@ class PugAdapter {
                 return callback(err);
             }
             if (this.config.inlineCssEnabled) {
-                inlineCss(body, this.config.inlineCssOptions)
-                    .then((html) => {
-                    mail.data.html = html;
-                    return callback();
-                })
-                    .catch(callback);
+                try {
+                    mail.data.html = (0, css_inline_1.inline)(body, this.config.inlineCssOptions);
+                }
+                catch (e) { }
             }
             else {
                 mail.data.html = body;
-                return callback();
             }
+            return callback();
         });
     }
 }

package/dist/interfaces/mailer-options.interface.d.ts

@@ -6,8 +6,8 @@ import * as StreamTransport from 'nodemailer/lib/stream-transport';
 import * as JSONTransport from 'nodemailer/lib/json-transport';
 import * as SESTransport from 'nodemailer/lib/ses-transport';
 import { TemplateAdapter } from './template-adapter.interface';
-declare type Options = SMTPTransport.Options | SMTPPool.Options | SendmailTransport.Options | StreamTransport.Options | JSONTransport.Options | SESTransport.Options | TransportOptions;
-export declare type TransportType = Options | SMTPTransport | SMTPPool | SendmailTransport | StreamTransport | JSONTransport | SESTransport | Transport | string;
+type Options = SMTPTransport.Options | SMTPPool.Options | SendmailTransport.Options | StreamTransport.Options | JSONTransport.Options | SESTransport.Options | TransportOptions;
+export type TransportType = Options | SMTPTransport | SMTPPool | SendmailTransport | StreamTransport | JSONTransport | SESTransport | Transport | string;
 export interface MailerOptions {
     defaults?: Options;
     transport?: TransportType;

package/dist/interfaces/send-mail-options.interface.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 import { SendMailOptions } from 'nodemailer';
 import * as DKIM from 'nodemailer/lib/dkim';
-export declare type TextEncoding = 'quoted-printable' | 'base64';
-export declare type Headers = {
+import { Attachment } from 'nodemailer/lib/mailer';
+export type TextEncoding = 'quoted-printable' | 'base64';
+export type Headers = {
     [key: string]: string | string[] | {
         prepared: boolean;
         value: string;
@@ -22,7 +23,7 @@ export interface ISendMailOptions extends SendMailOptions {
     to?: string | Address | Array<string | Address>;
     cc?: string | Address | Array<string | Address>;
     bcc?: string | Address | Array<string | Address>;
-    replyTo?: string | Address;
+    replyTo?: string | Address | Array<string | Address>;
     inReplyTo?: string | Address;
     from?: string | Address;
     subject?: string;
@@ -40,15 +41,6 @@ export interface ISendMailOptions extends SendMailOptions {
     };
     transporterName?: string;
     template?: string;
-    attachments?: {
-        filename: string;
-        content?: any;
-        path?: string;
-        contentType?: string;
-        cid?: string;
-        encoding?: string;
-        contentDisposition?: 'attachment' | 'inline' | undefined;
-        href?: string;
-    }[];
+    attachments?: Attachment[];
     dkim?: DKIM.Options;
 }

package/dist/interfaces/template-adapter-config.interface.d.ts

@@ -1,5 +1,5 @@
-import InlineCss = require('inline-css');
+import { InlineOptions } from 'css-inline';
 export interface TemplateAdapterConfig {
-    inlineCssOptions?: InlineCss.Options;
+    inlineCssOptions?: InlineOptions;
     inlineCssEnabled?: boolean;
 }

package/dist/mailer-core.module.js

@@ -67,8 +67,8 @@ let MailerCoreModule = MailerCoreModule_1 = class MailerCoreModule {
         };
     }
 };
-MailerCoreModule = MailerCoreModule_1 = tslib_1.__decorate([
+exports.MailerCoreModule = MailerCoreModule;
+exports.MailerCoreModule = MailerCoreModule = MailerCoreModule_1 = tslib_1.__decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({})
 ], MailerCoreModule);
-exports.MailerCoreModule = MailerCoreModule;

package/dist/mailer-transport.factory.js

@@ -13,8 +13,8 @@ let MailerTransportFactory = class MailerTransportFactory {
         return (0, nodemailer_1.createTransport)(opts || this.options.transport, this.options.defaults);
     }
 };
-MailerTransportFactory = tslib_1.__decorate([
+exports.MailerTransportFactory = MailerTransportFactory;
+exports.MailerTransportFactory = MailerTransportFactory = tslib_1.__decorate([
     tslib_1.__param(0, (0, common_1.Inject)(mailer_constant_1.MAILER_OPTIONS)),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], MailerTransportFactory);
-exports.MailerTransportFactory = MailerTransportFactory;

package/dist/mailer.module.js

@@ -23,7 +23,7 @@ let MailerModule = MailerModule_1 = class MailerModule {
         };
     }
 };
-MailerModule = MailerModule_1 = tslib_1.__decorate([
+exports.MailerModule = MailerModule;
+exports.MailerModule = MailerModule = MailerModule_1 = tslib_1.__decorate([
     (0, common_1.Module)({})
 ], MailerModule);
-exports.MailerModule = MailerModule;

package/dist/mailer.service.js

@@ -8,6 +8,23 @@ const previewEmail = require("preview-email");
 const mailer_constant_1 = require("./constants/mailer.constant");
 const mailer_transport_factory_1 = require("./mailer-transport.factory");
 let MailerService = class MailerService {
+    initTemplateAdapter(templateAdapter, transporter) {
+        if (templateAdapter) {
+            transporter.use('compile', (mail, callback) => {
+                if (mail.data.html) {
+                    return callback();
+                }
+                return templateAdapter.compile(mail, callback, this.mailerOptions);
+            });
+            if (this.mailerOptions.preview) {
+                transporter.use('stream', (mail, callback) => {
+                    return previewEmail(mail.data, this.mailerOptions.preview)
+                        .then(() => callback())
+                        .catch(callback);
+                });
+            }
+        }
+    }
     constructor(mailerOptions, transportFactory) {
         this.mailerOptions = mailerOptions;
         this.transportFactory = transportFactory;
@@ -39,23 +56,6 @@ let MailerService = class MailerService {
             this.initTemplateAdapter(this.templateAdapter, this.transporter);
         }
     }
-    initTemplateAdapter(templateAdapter, transporter) {
-        if (templateAdapter) {
-            transporter.use('compile', (mail, callback) => {
-                if (mail.data.html) {
-                    return callback();
-                }
-                return templateAdapter.compile(mail, callback, this.mailerOptions);
-            });
-            if (this.mailerOptions.preview) {
-                transporter.use('stream', (mail, callback) => {
-                    return previewEmail(mail.data, this.mailerOptions.preview)
-                        .then(() => callback())
-                        .catch(callback);
-                });
-            }
-        }
-    }
     sendMail(sendMailOptions) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (sendMailOptions.transporterName) {
@@ -85,11 +85,11 @@ let MailerService = class MailerService {
         return transporterName;
     }
 };
-MailerService = tslib_1.__decorate([
+exports.MailerService = MailerService;
+exports.MailerService = MailerService = tslib_1.__decorate([
     (0, common_1.Injectable)(),
     tslib_1.__param(0, (0, common_1.Inject)(mailer_constant_1.MAILER_OPTIONS)),
     tslib_1.__param(1, (0, common_1.Optional)()),
     tslib_1.__param(1, (0, common_1.Inject)(mailer_constant_1.MAILER_TRANSPORT_FACTORY)),
     tslib_1.__metadata("design:paramtypes", [Object, Object])
 ], MailerService);
-exports.MailerService = MailerService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs-modules/mailer",
-  "version": "1.8.1",
+  "version": "1.10.3",
   "private": false,
   "description": "NestJS - a mailer module (@mailer)",
   "keywords": [
@@ -52,55 +52,55 @@
     ]
   },
   "dependencies": {
-    "glob": "8.0.3",
-    "inline-css": "4.0.1",
-    "mjml": "^4.12.0",
-    "preview-email": "3.0.5"
+    "css-inline": "0.11.2",
+    "glob": "10.3.10",
+    "mjml": "4.14.1",
+    "preview-email": "3.0.19"
   },
   "optionalDependencies": {
-    "@types/ejs": "^3.0.3",
-    "@types/pug": "2.0.6",
-    "ejs": "^3.1.2",
-    "handlebars": "^4.7.6",
-    "pug": "^3.0.1"
+    "@types/ejs": "^3.1.5",
+    "@types/pug": "^2.0.10",
+    "ejs": "^3.1.9",
+    "handlebars": "^4.7.8",
+    "pug": "^3.0.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.0.3",
-    "@commitlint/config-angular": "17.0.3",
-    "@nestjs/common": "^9.0.1",
-    "@nestjs/core": "^9.0.1",
-    "@nestjs/testing": "^9.0.1",
-    "@types/glob": "7.2.0",
-    "@types/inline-css": "3.0.1",
-    "@types/jest": "26.0.24",
-    "@types/lodash": "4.14.182",
-    "@types/nodemailer": "6.4.4",
-    "@types/pug": "2.0.6",
-    "@typescript-eslint/eslint-plugin": "5.30.7",
-    "@typescript-eslint/parser": "5.30.7",
-    "husky": "8.0.1",
-    "jest": "27.0.6",
-    "lint-staged": "13.0.3",
-    "nodemailer": "6.7.7",
-    "nodemailer-mock": "1.5.12",
-    "prettier": "2.7.1",
-    "reflect-metadata": "0.1.13",
-    "rimraf": "3.0.2",
-    "rxjs": "7.5.6",
+    "@commitlint/cli": "18.4.3",
+    "@commitlint/config-angular": "18.4.3",
+    "@nestjs/common": "10.3.0",
+    "@nestjs/core": "10.3.0",
+    "@nestjs/testing": "10.3.0",
+    "@types/glob": "8.1.0",
+    "@types/jest": "29.5.11",
+    "@types/lodash": "4.14.202",
+    "@types/nodemailer": "6.4.14",
+    "@types/pug": "2.0.10",
+    "@typescript-eslint/eslint-plugin": "6.15.0",
+    "@typescript-eslint/parser": "6.15.0",
+    "husky": "8.0.3",
+    "jest": "29.7.0",
+    "lint-staged": "15.2.0",
+    "nodemailer": "6.9.7",
+    "nodemailer-mock": "2.0.3",
+    "prettier": "3.1.1",
+    "reflect-metadata": "0.2.1",
+    "rimraf": "5.0.5",
+    "rxjs": "7.8.1",
     "standard-version": "9.5.0",
-    "ts-jest": "27.1.2",
-    "ts-node": "10.9.1",
-    "typescript": "4.7.4",
-    "yarn-audit-fix": "^9.3.2"
+    "ts-jest": "29.1.1",
+    "ts-node": "10.9.2",
+    "tslib": "2.6.2",
+    "typescript": "5.3.3",
+    "yarn-audit-fix": "10.0.7"
   },
   "peerDependencies": {
-    "@nestjs/common": "^7.0.9 || ^8.0.0 || ^9.0.0",
-    "@nestjs/core": "^7.0.9 || ^8.0.0 || ^9.0.0",
-    "@types/ejs": "^3.0.3",
-    "@types/pug": "2.0.6",
-    "ejs": "^3.1.2",
-    "handlebars": "^4.7.6",
-    "nodemailer": "^6.4.6",
-    "pug": "^3.0.1"
+    "@nestjs/common": ">=7.0.9",
+    "@nestjs/core": ">=7.0.9",
+    "@types/ejs": ">=3.0.3",
+    "@types/pug": ">=2.0.6",
+    "ejs": ">=3.1.2",
+    "handlebars": ">=4.7.6",
+    "nodemailer": ">=6.4.6",
+    "pug": ">=3.0.1"
   }
 }