nuxt-mail 3.0.23 → 3.1.1

package/README.md

@@ -67,13 +67,14 @@ $ yarn add nuxt-mail
 ```
 <!-- /INSTALL -->
 
-## Usage
+## Configuration
+
+Add the module to the `modules` array in your `nuxt.config.js`. Note to add it to `modules` instead of `buildModules`, otherwise the server route will not be generated.
 
-Add the module to the `modules` array in your `nuxt.config.js`. Note to add it to `modules` instead of `buildModules`, otherwise the server route will not be generated. We also have to install the [@nuxtjs/axios](https://www.npmjs.com/package/@nuxtjs/axios) module because it is used internally to call the server route:
 ```js
+// nuxt.config.js
 export default {
   modules: [
-    '@nuxtjs/axios',
     ['nuxt-mail', {
       message: {
         to: 'foo@bar.de',
@@ -101,36 +102,109 @@ The `smtp` options are required and directly passed to [nodemailer](https://node
 
 The module injects the `$mail` variable, which we now use to send emails:
 
-```js
-// Inside a component
-this.$mail.send({
+## Nuxt 3
+
+### Via composable
+
+```html
+<script setup>
+const mail = useMail()
+
+mail.send({
   from: 'John Doe',
   subject: 'Incredible',
   text: 'This is an incredible test message',
 })
+</script>
 ```
 
-You can also directly call the generated `/mail/send` post route:
+### Via injected variable
 
-```js
-// Inside a component
-this.$axios.$post('/mail/send', {
+```html
+<script setup>
+const { $mail } = useNuxtApp()
+
+$mail.send({
   from: 'John Doe',
   subject: 'Incredible',
   text: 'This is an incredible test message',
 })
+</script>
+```
+
+### Via Options API
+
+```html
+<script>
+export default {
+  methods: {
+    sendEmail() {
+      this.$mail.send({
+        from: 'John Doe',
+        subject: 'Incredible',
+        text: 'This is an incredible test message',
+      })
+    },
+  },
+}
+</script>
 ```
 
-Note that the data are passed to [nodemailer](https://nodemailer.com/message/). Refer to the documentation for available config options.
+## Nuxt 2
+
+For Nuxt 2, you need to install [@nuxtjs/axios](https://www.npmjs.com/package/@nuxtjs/axios) and add it to your module list before `nuxt-mail`:
+
+```js
+// nuxt.config.js
+export default {
+  modules: [
+    [
+      '@nuxtjs/axios',
+      ['nuxt-mail', { /* ... */ }],
+    }],
+  ],
+}
+```
+
+Then you can use the injected variable like so:
+
+```html
+<script>
+export default {
+  methods: {
+    sendEmail() {
+      this.$mail.send({
+        from: 'John Doe',
+        subject: 'Incredible',
+        text: 'This is an incredible test message',
+      })
+    },
+  },
+}
+</script>
+```
+
+### Note about production use
+
+When you use `nuxt-mail` in production and you configured a reverse proxy that hides your localhost behind a domain, you need to tell `@nuxt/axios` which base URL you are using. Otherwise `nuxt-mail` won't find the send route. Refer to [@nuxt/axios options](https://axios.nuxtjs.org/options) on how to do that. The easiest option is to set the `API_URL` environment variable, or set something else in your `nuxt.config.js`:
+
+```js
+// nuxt.config.js
+export default {
+  axios: {
+    baseURL: process.env.BASE_URL,
+  },
+}
+```
 
 ## Multiple message configs
 
 It is also possible to provide multiple message configurations by changing the `message` config into an array.
 
 ```js
+// nuxt.config.js
 export default {
   modules: [
-    '@nuxtjs/axios',
     ['nuxt-mail', {
       message: [
         { name: 'contact', to: 'contact@foo.de' },
@@ -145,7 +219,7 @@ export default {
 Then you can reference the config like this:
 
 ```js
-this.$axios.$post('/mail/send', {
+mail.send({
   config: 'support',
   from: 'John Doe',
   subject: 'Incredible',
@@ -156,7 +230,7 @@ this.$axios.$post('/mail/send', {
 Or via index (in which case you do not need the `name` property):
 
 ```js
-this.$axios.$post('/mail/send', {
+mail.send({
   config: 1, // Resolves to 'support'
   from: 'John Doe',
   subject: 'Incredible',
@@ -164,20 +238,6 @@ this.$axios.$post('/mail/send', {
 })
 ```
 
-## Note about production use
-
-When you use `nuxt-mail` in production and you configured a reverse proxy that hides your localhost behind a domain, you need to tell `@nuxt/axios` which base URL you are using. Otherwise `nuxt-mail` won't find the send route. Refer to [@nuxt/axios options](https://axios.nuxtjs.org/options) on how to do that. The easiest option is to set the `API_URL` environment variable, or set something else in your `nuxt.config.js`:
-
-```js
-// nuxt.config.js
-
-export default {
-  axios: {
-    baseURL: process.env.BASE_URL,
-  },
-}
-```
-
 Also, the module does not work for static sites (via `nuxt generate`) because the module creates a server route.
 
 ## Setting up popular email services
@@ -187,11 +247,10 @@ Also, the module does not work for static sites (via `nuxt generate`) because th
 You have to setup an [app-specific password](https://myaccount.google.com/apppasswords) to log into the SMTP server. Then, add the following config to your `nuxt-mail` config:
 
 ```js
+// nuxt.config.js
 export default {
   modules: [
-    '@nuxtjs/axios',
     ['nuxt-mail', {
-      // ...
       smtp: {
         service: 'gmail',
         auth: {
@@ -208,7 +267,7 @@ Missing something? Add your service here via a [pull request](https://github.com
 
 ## Debugging mail errors
 
-If the mail doesn't get sent, you can debug the error using the browser developer tools. If a `400` error is thrown (check out the console output), you can find the error message in the Network tab. For Chrome users, open the Network tab, then find the "send" request. Open it and select the "Response" tab. There it should show the error message. In most cases, it is related to authentication with the SMTP server.
+If the mail doesn't get sent, you can debug the error using the browser developer tools. If a `500` error is thrown (check out the console output), you can find the error message in the Network tab. For Chrome users, open the Network tab, then find the "send" request. Open it and select the "Response" tab. There it should show the error message. In most cases, it is related to authentication with the SMTP server.
 
 ## Open questions
 

package/dist/composable.js

@@ -0,0 +1,2 @@
+import { useNuxtApp } from '#app';
+export const useMail = () => useNuxtApp().$mail;

package/dist/index.js

@@ -1,89 +1,75 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _findIndex = _interopRequireDefault(require("@dword-design/functions/dist/find-index"));
-
-var _omit = _interopRequireDefault(require("@dword-design/functions/dist/omit"));
-
-var _some = _interopRequireDefault(require("@dword-design/functions/dist/some"));
-
-var _express = _interopRequireDefault(require("express"));
-
-var _nodemailer = _interopRequireDefault(require("nodemailer"));
-
-var _nuxtPushPlugins = _interopRequireDefault(require("nuxt-push-plugins"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _default(moduleOptions) {
-  var _options$message;
-
-  const options = { ...this.options.mail,
+import some from "@dword-design/functions/dist/some.js";
+import { addImports, addServerHandler, addTemplate, createResolver, isNuxt3 as isNuxt3Try } from '@nuxt/kit';
+import express from 'express';
+import fs from 'fs-extra';
+import nodemailer from 'nodemailer';
+import nuxtPushPlugins from 'nuxt-push-plugins';
+import parsePackagejsonName from 'parse-packagejson-name';
+import P from 'path';
+import send from "./send.js";
+const resolver = createResolver(import.meta.url);
+const packageConfig = fs.readJsonSync(resolver.resolve('../package.json'));
+const moduleName = parsePackagejsonName(packageConfig.name).fullName;
+export default function (moduleOptions, nuxt) {
+  nuxt = nuxt || this;
+  const options = {
+    ...nuxt.options.mail,
     ...moduleOptions
   };
-
   if (!options.smtp) {
     throw new Error('SMTP config is missing.');
   }
-
   if (Array.isArray(options.message) && options.message.length === 0 || !options.message) {
     throw new Error('You have to provide at least one config.');
   }
-
   if (!Array.isArray(options.message)) {
     options.message = [options.message];
   }
-
-  if (_options$message = options.message, (0, _some.default)(c => !c.to && !c.cc && !c.bcc)(_options$message)) {
+  if (some(c => !c.to && !c.cc && !c.bcc)(options.message)) {
     throw new Error('You have to provide to/cc/bcc in all configs.');
   }
-
-  const app = (0, _express.default)();
-
-  const transport = _nodemailer.default.createTransport(options.smtp);
-
-  app.use(_express.default.json());
-  app.post('/send', async (req, res) => {
-    req.body = {
-      config: 0,
-      ...req.body
-    };
-
-    try {
-      var _req$body, _options$message$req$;
-
-      if (typeof req.body.config === 'string') {
-        var _options$message2;
-
-        const configIndex = (_options$message2 = options.message, (0, _findIndex.default)(_ => _.name === req.body.config)(_options$message2));
-
-        if (configIndex === -1) {
-          throw new Error(`Message config with name '${req.body.config}' not found.`);
-        }
-
-        req.body.config = configIndex;
-      } else if (!options.message[req.body.config]) {
-        throw new Error(`Message config not found at index ${req.body.config}.`);
+  let isNuxt3 = true;
+  try {
+    isNuxt3 = isNuxt3Try();
+  } catch {
+    isNuxt3 = false;
+  }
+  if (isNuxt3) {
+    addTemplate({
+      filename: P.join(moduleName, 'options.js'),
+      getContents: () => `export default ${JSON.stringify(options, undefined, 2)}`,
+      write: true
+    });
+    addTemplate({
+      filename: P.join(moduleName, 'send.js'),
+      getContents: () => fs.readFile(resolver.resolve('./send.js'), 'utf8'),
+      write: true
+    });
+    nuxt.options.alias['#mail'] = P.resolve(nuxt.options.buildDir, moduleName);
+    addServerHandler({
+      handler: resolver.resolve('./server-handler.post.js'),
+      route: '/mail/send'
+    });
+    addImports([{
+      from: resolver.resolve('./composable.js'),
+      name: 'useMail'
+    }]);
+  } else {
+    const app = express();
+    const transport = nodemailer.createTransport(options.smtp);
+    app.use(express.json());
+    app.post('/send', async (req, res) => {
+      try {
+        await send(req.body, options, transport);
+      } catch (error) {
+        return res.status(500).send(error.message);
       }
-
-      await transport.sendMail({ ...(_req$body = req.body, (0, _omit.default)(['config', 'to', 'cc', 'bcc'])(_req$body)),
-        ...(_options$message$req$ = options.message[req.body.config], (0, _omit.default)(['name'])(_options$message$req$))
-      });
-    } catch (error) {
-      return res.status(400).send(error.message);
-    }
-
-    return res.sendStatus(200);
-  });
-  this.addServerMiddleware({
-    handler: app,
-    path: '/mail'
-  });
-  (0, _nuxtPushPlugins.default)(this, require.resolve("./plugin"));
-}
-
-module.exports = exports.default;
+      return res.sendStatus(200);
+    });
+    nuxt.addServerMiddleware({
+      handler: app,
+      path: '/mail'
+    });
+  }
+  nuxtPushPlugins(nuxt, resolver.resolve(`./plugin-nuxt${isNuxt3 ? 3 : 2}.js`));
+}

package/dist/plugin-nuxt2.js

@@ -0,0 +1,9 @@
+export default ((context, inject) => inject('mail', {
+  send: async config => {
+    try {
+      await context.app.$axios.$post('/mail/send', config);
+    } catch (error) {
+      throw new Error(error.response.data);
+    }
+  }
+}));

package/dist/plugin-nuxt3.js

@@ -0,0 +1,13 @@
+import { useFetch } from '#app';
+export default ((context, inject) => inject('mail', {
+  send: async config => {
+    try {
+      await useFetch('/mail/send', {
+        body: config,
+        method: 'POST'
+      });
+    } catch (error) {
+      throw new Error(error.response.data);
+    }
+  }
+}));

package/dist/send.js

@@ -0,0 +1,21 @@
+import findIndex from "@dword-design/functions/dist/find-index.js";
+import omit from "@dword-design/functions/dist/omit.js";
+export default (async (body, options, transport) => {
+  body = {
+    config: 0,
+    ...body
+  };
+  if (typeof body.config === 'string') {
+    const configIndex = findIndex(_ => _.name === body.config)(options.message);
+    if (configIndex === -1) {
+      throw new Error(`Message config with name '${body.config}' not found.`);
+    }
+    body.config = configIndex;
+  } else if (!options.message[body.config]) {
+    throw new Error(`Message config not found at index ${body.config}.`);
+  }
+  await transport.sendMail({
+    ...omit(['config', 'to', 'cc', 'bcc'])(body),
+    ...omit(['name'])(options.message[body.config])
+  });
+});

package/dist/server-handler.post.js

@@ -0,0 +1,16 @@
+import { createError, defineEventHandler, readBody } from 'h3';
+import nodemailer from 'nodemailer';
+import options from '#mail/options.js';
+import send from '#mail/send.js';
+const transport = nodemailer.createTransport(options.smtp);
+export default defineEventHandler(async event => {
+  try {
+    await send(await readBody(event), options, transport);
+  } catch (error) {
+    throw createError({
+      statusCode: 500,
+      statusMessage: error.message
+    });
+  }
+  return '';
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-mail",
-  "version": "3.0.23",
+  "version": "3.1.1",
   "description": "Adds email sending capability to a Nuxt.js app. Adds a server route, an injected variable, and uses nodemailer to send emails.",
   "keywords": [
     "email",
@@ -23,6 +23,8 @@
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
   "author": "Sebastian Landwehr <info@sebastianlandwehr.com>",
+  "type": "module",
+  "exports": "./dist/index.js",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -38,27 +40,27 @@
   },
   "dependencies": {
     "@dword-design/functions": "^4.0.0",
+    "@nuxt/kit": "^3.0.0",
     "express": "^4.17.1",
+    "fs-extra": "^11.1.0",
+    "h3": "^1.0.2",
     "nodemailer": "^6.4.11",
-    "nuxt-push-plugins": "^2.0.0"
+    "nuxt-push-plugins": "^2.1.2",
+    "parse-packagejson-name": "^1.0.1"
   },
   "devDependencies": {
-    "@dword-design/base": "^8.0.0",
-    "@dword-design/proxyquire": "^2.0.0",
+    "@dword-design/base": "^9.1.9",
     "@dword-design/puppeteer": "^5.0.0",
     "@dword-design/tester": "^2.0.0",
-    "@dword-design/tester-plugin-nodemailer-mock": "^1.0.0",
-    "@dword-design/tester-plugin-puppeteer": "^2.0.0",
+    "@dword-design/tester-plugin-nuxt-config": "^1.1.3",
+    "@dword-design/tester-plugin-puppeteer": "^2.1.22",
     "@nuxtjs/axios": "^5.13.1",
-    "axios": "^0.25.0",
+    "axios": "^0.27.2",
     "depcheck-package-name": "^2.0.0",
-    "nodemailer-mock": "^1.5.4",
-    "nuxt": "^2.15.3",
-    "output-files": "^2.0.0",
-    "with-local-tmp-dir": "^4.0.0"
+    "smtp-tester": "^2.0.1"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "publishConfig": {
     "access": "public"

package/dist/plugin.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _default = (context, inject) => inject('mail', {
-  send: async config => {
-    try {
-      await context.app.$axios.$post('/mail/send', config);
-    } catch (error) {
-      throw new Error(error.response.data);
-    }
-  }
-});
-
-exports.default = _default;
-module.exports = exports.default;