chore: wip

Author: glennmichael123

config/email.ts

@@ -24,35 +24,4 @@ export default {
   },
 
   default: env.MAIL_DRIVER || 'ses',
-
-  drivers: {
-    ses: {
-      region: env.AWS_SES_REGION || 'us-east-1',
-      credentials: {
-        accessKeyId: env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: env.AWS_SECRET_ACCESS_KEY,
-      },
-    },
-
-    sendgrid: {
-      apiKey: env.SENDGRID_API_KEY,
-      maxRetries: env.SENDGRID_MAX_RETRIES ? Number.parseInt(env.SENDGRID_MAX_RETRIES) : 3,
-      retryTimeout: env.SENDGRID_RETRY_TIMEOUT ? Number.parseInt(env.SENDGRID_RETRY_TIMEOUT) : 1000,
-    },
-
-    mailgun: {
-      apiKey: env.MAILGUN_API_KEY,
-      domain: env.MAILGUN_DOMAIN,
-      endpoint: env.MAILGUN_ENDPOINT || 'api.mailgun.net',
-      maxRetries: env.MAILGUN_MAX_RETRIES ? Number.parseInt(env.MAILGUN_MAX_RETRIES) : 3,
-      retryTimeout: env.MAILGUN_RETRY_TIMEOUT ? Number.parseInt(env.MAILGUN_RETRY_TIMEOUT) : 1000,
-    },
-
-    mailtrap: {
-      token: env.MAILTRAP_TOKEN,
-      inboxId: env.MAILTRAP_INBOX_ID,
-      maxRetries: env.MAILTRAP_MAX_RETRIES ? Number.parseInt(env.MAILTRAP_MAX_RETRIES) : 3,
-      retryTimeout: env.MAILTRAP_RETRY_TIMEOUT ? Number.parseInt(env.MAILTRAP_RETRY_TIMEOUT) : 1000,
-    },
-  },
 } satisfies EmailConfig

config/services.ts

@@ -16,6 +16,35 @@ export default {
     region: env.AWS_DEFAULT_REGION || 'us-east-1',
   },
 
+  ses: {
+    region: env.AWS_SES_REGION || 'us-east-1',
+    credentials: {
+      accessKeyId: env.AWS_ACCESS_KEY_ID,
+      secretAccessKey: env.AWS_SECRET_ACCESS_KEY,
+    },
+  },
+
+  sendgrid: {
+    apiKey: env.SENDGRID_API_KEY,
+    maxRetries: env.SENDGRID_MAX_RETRIES ? Number.parseInt(env.SENDGRID_MAX_RETRIES) : 3,
+    retryTimeout: env.SENDGRID_RETRY_TIMEOUT ? Number.parseInt(env.SENDGRID_RETRY_TIMEOUT) : 1000,
+  },
+
+  mailgun: {
+    apiKey: env.MAILGUN_API_KEY,
+    domain: env.MAILGUN_DOMAIN,
+    endpoint: env.MAILGUN_ENDPOINT || 'api.mailgun.net',
+    maxRetries: env.MAILGUN_MAX_RETRIES ? Number.parseInt(env.MAILGUN_MAX_RETRIES) : 3,
+    retryTimeout: env.MAILGUN_RETRY_TIMEOUT ? Number.parseInt(env.MAILGUN_RETRY_TIMEOUT) : 1000,
+  },
+
+  mailtrap: {
+    token: env.MAILTRAP_TOKEN,
+    inboxId: env.MAILTRAP_INBOX_ID,
+    maxRetries: env.MAILTRAP_MAX_RETRIES ? Number.parseInt(env.MAILTRAP_MAX_RETRIES) : 3,
+    retryTimeout: env.MAILTRAP_RETRY_TIMEOUT ? Number.parseInt(env.MAILTRAP_RETRY_TIMEOUT) : 1000,
+  },
+
   hetzner: {
     appId: '',
     apiKey: '',
@@ -36,10 +65,10 @@ export default {
     apiKey: '',
   },
 
-  lemonSqueezy: {
-    appId: '',
-    apiKey: '',
-  },
+  // lemonSqueezy: {
+  //   appId: '',
+  //   apiKey: '',
+  // },
 
   stripe: {
     appId: '',

storage/framework/core/types/src/email.ts

@@ -16,36 +16,6 @@ export interface EmailOptions {
   }
 
   default: 'ses' | 'sendgrid' | 'mailgun' | 'mailtrap'
-
-  drivers: {
-    ses?: {
-      region: string
-      credentials: {
-        accessKeyId?: string
-        secretAccessKey?: string
-      }
-      maxRetries?: number
-      retryTimeout?: number
-    }
-    sendgrid?: {
-      apiKey?: string
-      maxRetries?: number
-      retryTimeout?: number
-    }
-    mailgun?: {
-      apiKey?: string
-      domain?: string
-      endpoint?: string
-      maxRetries?: number
-      retryTimeout?: number
-    }
-    mailtrap?: {
-      token?: string
-      inboxId?: string | number
-      maxRetries?: number
-      retryTimeout?: number
-    }
-  }
 }
 
 export type EmailConfig = Partial<EmailOptions>

storage/framework/core/types/src/services.ts

@@ -4,21 +4,64 @@ export interface ServicesOptions {
     apiKey: string
   }
 
+  aws?: {
+    accountId: string
+    appId: string
+    apiKey: string
+    region: string
+  }
+
   godaddy?: {
     apiKey: string
     apiSecret: string
   }
 
-  meilisearch?: {
+  hetzner: {
     appId: string
     apiKey: string
   }
 
-  lemonSqueezy?: {
+  // lemonSqueezy?: {
+  //   appId: string
+  //   apiKey: string
+  // }
+
+  mailgun?: {
+    apiKey?: string
+    domain?: string
+    endpoint?: string
+    maxRetries?: number
+    retryTimeout?: number
+  }
+
+  mailtrap?: {
+    token?: string
+    inboxId?: string | number
+    maxRetries?: number
+    retryTimeout?: number
+  }
+
+  meilisearch?: {
     appId: string
     apiKey: string
   }
 
+  sendgrid?: {
+    apiKey?: string
+    maxRetries?: number
+    retryTimeout?: number
+  }
+
+  ses?: {
+    region: string
+    credentials: {
+      accessKeyId?: string
+      secretAccessKey?: string
+    }
+    maxRetries?: number
+    retryTimeout?: number
+  }
+
   stripe?: {
     appId: string
     apiKey: string
@@ -28,13 +71,6 @@ export interface ServicesOptions {
   //   appId: string
   //   apiKey: string
   // }
-
-  aws?: {
-    accountId: string
-    appId: string
-    apiKey: string
-    region: string
-  }
 }
 
 export type ServicesConfig = Partial<ServicesOptions>