Merge pull request #21 from formidablejs/feature/config-clean-up

Feature/config clean up

Author: donaldp

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,7 @@
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] This change requires a documentation update
+- [ ] Maintenance task (non-breaking & no new features)  
 
 ## Checklist:
 

formidable/config.imba

@@ -1,5 +1,3 @@
-import { helpers } from '@formidablejs/framework'
-
 export default {
 	# --------------------------------------------------------------------------
 	# Default Mailer
@@ -20,11 +18,11 @@ export default {
 	mailers: {
 		smtp: {
 			transport: 'smtp'
-			host: helpers.env 'MAIL_HOST', 'smtp.mailgun.org'
-			port: helpers.env 'MAIL_PORT', 587
-			secure: helpers.env 'MAIL_SECURE', true
-			username: helpers.env 'MAIL_USERNAME'
-			password: helpers.env 'MAIL_PASSWORD'
+			host: env 'MAIL_HOST', 'smtp.mailgun.org'
+			port: env 'MAIL_PORT', 587
+			secure: env 'MAIL_SECURE', true
+			username: env 'MAIL_USERNAME'
+			password: env 'MAIL_PASSWORD'
 		}
 
 		sendmail: {
@@ -41,7 +39,7 @@ export default {
 	# The email address that will be used in the "From" field of all emails.
 
 	from: {
-		address: helpers.env 'MAIL_FROM_ADDRESS', 'hello@example.com'
-		name: helpers.env 'MAIL_FROM_NAME', 'Example'
+		address: env 'MAIL_FROM_ADDRESS', 'hello@example.com'
+		name: env 'MAIL_FROM_NAME', 'Example'
 	}
 }

formidable/config.ts

@@ -1,5 +1,3 @@
-import { helpers } from '@formidablejs/framework';
-
 export default {
 	/**
 	 * --------------------------------------------------------------------------
@@ -24,11 +22,11 @@ export default {
 	mailers: {
 		smtp: {
 			transport: 'smtp',
-			host: helpers.env('MAIL_HOST', 'smtp.mailgun.org'),
-			port: helpers.env('MAIL_PORT', 587),
-			secure: helpers.env('MAIL_SECURE', true),
-			username: helpers.env('MAIL_USERNAME'),
-			password: helpers.env('MAIL_PASSWORD')
+			host: env('MAIL_HOST', 'smtp.mailgun.org'),
+			port: env('MAIL_PORT', 587),
+			secure: env('MAIL_SECURE', true),
+			username: env('MAIL_USERNAME'),
+			password: env('MAIL_PASSWORD')
 		},
 
 		sendmail: {
@@ -47,7 +45,7 @@ export default {
 	 */
 
 	from: {
-		address: helpers.env('MAIL_FROM_ADDRESS', 'hello@example.com'),
-		name: helpers.env('MAIL_FROM_NAME', 'Example')
+		address: env('MAIL_FROM_ADDRESS', 'hello@example.com'),
+		name: env('MAIL_FROM_NAME', 'Example')
 	}
-}
+}