Merge pull request #1 from varanauskas/master

Isolate SendGrid MailService used, so it does not use the global one nodemailer#14
Yhozen · Jun 22, 2023 · c73d2d8 · c73d2d8
2 parents 54dc309 + f286333
commit c73d2d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -1,15 +1,16 @@
 'use strict';
 
 const packageData = require('./package.json');
-const sgMail = require('@sendgrid/mail');
+const { MailService } = require('@sendgrid/mail');
 
 class SendGridTransport {
     constructor(options) {
         this.options = options || {};
         this.name = packageData.name;
         this.version = packageData.version;
+        this.sgMail = new MailService();
         if (options.apiKey) {
-            sgMail.setApiKey(options.apiKey);
+            this.sgMail.setApiKey(options.apiKey);
         }
     }
 
@@ -123,7 +124,7 @@ class SendGridTransport {
                 }
             }
 
-            sgMail.send(msg, callback);
+            this.sgMail.send(msg, callback);
         });
     }
 }

diff --git a/package.json b/package.json
@@ -6,16 +6,19 @@
     "scripts": {
         "test": "grunt"
     },
-    "keywords": ["nodemailer", "sendgrid"],
+    "keywords": [
+        "nodemailer",
+        "sendgrid"
+    ],
     "author": "Andris Reinman",
     "license": "MIT",
     "dependencies": {
-        "@sendgrid/mail": "^6.2.1"
+        "@sendgrid/mail": "^7.4.4"
     },
     "devDependencies": {
         "eslint-config-nodemailer": "^1.2.0",
         "grunt": "^1.0.2",
-        "grunt-eslint": "^20.1.0",
-        "nodemailer": "^4.6.3"
+        "grunt-eslint": "^23.0.0",
+        "nodemailer": "^6.6.1"
     }
 }