@maizzle/framework 4.4.0-beta.8 → 4.4.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "4.4.0-beta.8",
+  "version": "4.4.0-beta.9",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "main": "src/index.js",
@@ -74,10 +74,10 @@
     "query-string": "^7.1.3",
     "string-remove-widows": "^2.1.0",
     "string-strip-html": "^8.2.0",
-    "tailwindcss": "^3.2.4"
+    "tailwindcss": "^3.2.6"
   },
   "devDependencies": {
-    "ava": "^5.1.1",
+    "ava": "^5.2.0",
     "c8": "^7.11.0",
     "np": "*",
     "xo": "0.39.1"

package/src/commands/serve.js

@@ -81,16 +81,21 @@ const serve = async (env = 'local', config = {}) => {
 
         spinner.start('Building email...')
 
-        file = file.replace(/\\/g, '/')
-
-        const renderOptions = {
-          maizzle: config,
-          ...config.events
-        }
-
         renderToString(
-          await fs.readFile(file, 'utf8'),
-          renderOptions
+          await fs.readFile(file.replace(/\\/g, '/'), 'utf8'),
+          {
+            maizzle: merge(
+              config,
+              {
+                build: {
+                  current: {
+                    path: path.parse(file)
+                  }
+                }
+              }
+            ),
+            ...config.events
+          }
         )
           .then(async ({html, config}) => {
             let source = ''

package/src/generators/output/to-disk.js

@@ -2,7 +2,6 @@ const path = require('path')
 const fs = require('fs-extra')
 const glob = require('glob-promise')
 const {get, isEmpty, merge} = require('lodash')
-const {asyncForEach} = require('../../utils/helpers')
 
 const Config = require('../config')
 const Tailwind = require('../tailwindcss')
@@ -31,7 +30,7 @@ module.exports = async (env, spinner, config) => {
     : await Tailwind.compile({config})
 
   // Parse each template config object
-  await asyncForEach(templatesConfig, async templateConfig => {
+  for await (const templateConfig of templatesConfig) {
     if (!templateConfig) {
       const configFileName = env === 'local' ? 'config.js' : `config.${env}.js`
       throw new Error(`No template sources defined in \`build.templates\`, check your ${configFileName} file`)
@@ -79,18 +78,20 @@ module.exports = async (env, spinner, config) => {
       : templateConfig.filetypes || get(templateConfig, 'filetypes', 'html')
 
     // List of files that won't be copied to the output directory
-    const omitted = Array.isArray(templateConfig.omit) ?
-      templateConfig.omit :
-      [get(templateConfig, 'omit', '')]
+    const omitted = Array.isArray(templateConfig.omit)
+      ? templateConfig.omit
+      : [get(templateConfig, 'omit', '')]
 
     // Parse each template source
-    await asyncForEach(templateSource, async source => {
+    for await (const source of templateSource) {
       /**
        * Copy single-file sources correctly
        * If `src` is a file, `dest` cannot be a directory
        * https://github.com/jprichardson/node-fs-extra/issues/323
        */
-      const out = fs.lstatSync(source).isFile() ? `${outputDir}/${path.basename(source)}` : outputDir
+      const out = fs.lstatSync(source).isFile()
+        ? `${outputDir}/${path.basename(source)}`
+        : outputDir
 
       await fs
         .copy(source, out, {filter: file => {
@@ -119,7 +120,7 @@ module.exports = async (env, spinner, config) => {
             await config.events.beforeCreate(config)
           }
 
-          await asyncForEach(templates, async file => {
+          for await (const file of templates) {
             config.build.current = {
               path: path.parse(file)
             }
@@ -202,18 +203,18 @@ module.exports = async (env, spinner, config) => {
                   throw error
               }
             }
-          })
+          }
 
           const assets = {source: '', destination: 'assets', ...get(templateConfig, 'assets')}
 
           if (Array.isArray(assets.source)) {
-            await asyncForEach(assets.source, async source => {
+            for await (const source of assets.source) {
               if (fs.existsSync(source)) {
                 await fs
                   .copy(source, path.join(templateConfig.destination.path, assets.destination))
                   .catch(error => spinner.warn(error.message))
               }
-            })
+            }
           } else {
             if (fs.existsSync(assets.source)) {
               await fs
@@ -228,8 +229,8 @@ module.exports = async (env, spinner, config) => {
             })
         })
         .catch(error => spinner.warn(error.message))
-    })
-  })
+    }
+  }
 
   if (config.events && typeof config.events.afterBuild === 'function') {
     await config.events.afterBuild(files)

package/src/utils/helpers.js

@@ -1,9 +1,4 @@
 module.exports = {
-  asyncForEach: async (array, callback) => {
-    for (let index = 0; index < array.length; index++) {
-      await callback(array[index], index, array) // eslint-disable-line
-    }
-  },
   requireUncached: module => {
     try {
       delete require.cache[require.resolve(module)]