refactor: project maintenance

- work in progress

1 files changed, 32 insertions, 32 deletions

diff --git a/config/mail.ts b/config/mail.ts
index 3f688ce..7d650d5 100644
--- a/config/mail.ts
+++ b/config/mail.ts
@@ -5,10 +5,10 @@
  * file.
  */
 
-import Env from '@ioc:Adonis/Core/Env';
-import { mailConfig } from '@adonisjs/mail/build/config';
+import env from '#start/env'
+import { defineConfig } from '@adonisjs/mail'
 
-export default mailConfig({
+export default defineConfig({
   /*
   |--------------------------------------------------------------------------
   | Default mailer
@@ -18,7 +18,7 @@ export default mailConfig({
   | a mailer
   |
   */
-  mailer: Env.get('MAIL_CONNECTION', 'smtp'),
+  mailer: env.get('MAIL_CONNECTION', 'smtp'),
 
   /*
   |--------------------------------------------------------------------------
@@ -42,22 +42,21 @@ export default mailConfig({
     | Uses SMTP protocol for sending email
     |
     */
-    smtp: {
-      driver: 'smtp',
-      name: Env.get('APP_URL'),
-      port: Env.get('SMTP_PORT', '2525'),
-      host: Env.get('SMTP_HOST', 'localhost'),
-      secure: JSON.parse(Env.get('MAIL_SSL', 'false')),
-      requireTLS: JSON.parse(Env.get('MAIL_REQUIRE_TLS', 'false')),
+    smtp: drivers.smtp({
+      name: env.get('APP_URL'),
+      port: env.get('SMTP_PORT', '2525'),
+      host: env.get('SMTP_HOST', 'localhost'),
+      secure: JSON.parse(env.get('MAIL_SSL', 'false')),
+      requireTLS: JSON.parse(env.get('MAIL_REQUIRE_TLS', 'false')),
       auth: {
-        user: Env.get('MAIL_USERNAME'),
-        pass: Env.get('MAIL_PASSWORD'),
+        user: env.get('MAIL_USERNAME'),
+        pass: env.get('MAIL_PASSWORD'),
         type: 'login',
       },
       maxConnections: 5,
       maxMessages: 100,
       rateLimit: 10,
-    },
+    }),
 
     /*
     |--------------------------------------------------------------------------
@@ -72,47 +71,48 @@ export default mailConfig({
     | ```
     |
     */
-    ses: {
-      driver: 'ses',
+    ses: drivers.ses({
       apiVersion: '2010-12-01',
-      key: Env.get('SES_ACCESS_KEY'),
-      secret: Env.get('SES_ACCESS_SECRET'),
-      region: Env.get('SES_REGION'),
+      key: env.get('SES_ACCESS_KEY'),
+      secret: env.get('SES_ACCESS_SECRET'),
+      region: env.get('SES_REGION'),
       sslEnabled: true,
       sendingRate: 10,
       maxConnections: 5,
-    },
+    }),
 
     /*
     |--------------------------------------------------------------------------
     | Mailgun
     |--------------------------------------------------------------------------
     |
-                | Uses Mailgun service for sending emails.
+        | Uses Mailgun service for sending emails.
     |
     | If you are using an EU domain. Ensure to change the baseUrl to hit the
     | europe endpoint (https://api.eu.mailgun.net/v3).
     |
     */
-    mailgun: {
-      driver: 'mailgun',
+    mailgun: drivers.mailgun({
       baseUrl: 'https://api.mailgun.net/v3',
-      key: Env.get('MAILGUN_API_KEY'),
-      domain: Env.get('MAILGUN_DOMAIN'),
-    },
+      key: env.get('MAILGUN_API_KEY'),
+      domain: env.get('MAILGUN_DOMAIN'),
+    }),
 
     /*
     |--------------------------------------------------------------------------
     | SparkPost
     |--------------------------------------------------------------------------
     |
-                | Uses Sparkpost service for sending emails.
+        | Uses Sparkpost service for sending emails.
     |
     */
-    sparkpost: {
-      driver: 'sparkpost',
+    sparkpost: drivers.sparkpost({
       baseUrl: 'https://api.sparkpost.com/api/v1',
-      key: Env.get('SPARKPOST_API_KEY'),
-    },
+      key: env.get('SPARKPOST_API_KEY'),
+    }),
   },
-});
+})
+
+declare module '@adonisjs/mail/types' {
+  export interface MailersList extends InferMailers<typeof mailConfig> {}
+}