nuxt-mail 3.0.22 → 3.1.0

package/README.md

@@ -157,7 +157,7 @@ Or via index (in which case you do not need the `name` property):
 
 ```js
 this.$axios.$post('/mail/send', {
-  config: 1, // resolves to 'support'
+  config: 1, // Resolves to 'support'
   from: 'John Doe',
   subject: 'Incredible',
   text: 'This is an incredible test message',

package/dist/index.js

@@ -1,89 +1,71 @@
-"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 { 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'
+    });
+  } 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.22",
+  "version": "3.1.0",
   "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;