@maizzle/framework 4.4.4 → 4.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "4.4.4",
+  "version": "4.4.6",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "main": "src/index.js",

package/src/generators/tailwindcss.js

@@ -92,7 +92,9 @@ module.exports = {
 
     if (buildTemplates) {
       const templateObjects = Array.isArray(buildTemplates) ? buildTemplates : [buildTemplates]
-      const fileTypes = get(buildTemplates, 'filetypes', 'html')
+      const configFileTypes = get(buildTemplates, 'filetypes', ['html'])
+      const fileTypes = Array.isArray(configFileTypes) ? configFileTypes : configFileTypes.split('|')
+      const fileTypesPattern = fileTypes.length > 1 ? `{${fileTypes.join(',')}}` : fileTypes[0]
 
       templateObjects.forEach(template => {
         const source = get(template, 'source')
@@ -101,7 +103,7 @@ module.exports = {
           const sources = source(config)
 
           if (Array.isArray(sources)) {
-            sources.map(s => tailwindConfig.content.files.push(`${s}/**/*.${fileTypes}`))
+            sources.map(s => tailwindConfig.content.files.push(`${s}/**/*.${fileTypesPattern}`))
           } else if (typeof sources === 'string') {
             tailwindConfig.content.files.push(sources)
           }
@@ -114,7 +116,7 @@ module.exports = {
 
         // Default behavior - directory sources as a string
         else {
-          tailwindConfig.content.files.push(`${source}/**/*.${fileTypes}`)
+          tailwindConfig.content.files.push(`${source}/**/*.${fileTypesPattern}`)
         }
       })
     }

package/src/transformers/filters/index.js

@@ -30,7 +30,7 @@ module.exports = async (html, config = {}, direct = false) => {
     config: merge({
       build: {
         tailwind: {
-          config: get(config, 'build.tailwind.config', {})
+          config: get(config, 'build.tailwind.config', 'tailwind.config.js')
         }
       }
     }, maizzleConfig)
@@ -41,7 +41,11 @@ module.exports = async (html, config = {}, direct = false) => {
     posthtmlContent(filters)
   ]
 
-  if (get(config, 'safeClassNames') !== false) {
+  /**
+   * Run `safeClassNames` in filters only when not when developing locally and
+   * `safeClassNames` is not explicitly disabled (set to `false`).
+   */
+  if (get(config, 'env') !== 'local' && get(config, 'safeClassNames') !== false) {
     posthtmlPlugins.push(safeClassNames({
       replacements: {
         '{': '{',

package/src/transformers/removeUnusedCss.js

@@ -33,7 +33,7 @@ module.exports = async (html, config = {}, direct = false) => {
       {heads: '{{', tails: '}}'},
       {heads: '{%', tails: '%}'}
     ],
-    whitelist: [...get(config, 'whitelist', []), ...safelist]
+    whitelist: get(config, 'whitelist', safelist)
   }
 
   const options = merge(defaultOptions, config)

package/src/transformers/safeClassNames.js

@@ -1,20 +1,21 @@
 const posthtml = require('posthtml')
-const {get, merge} = require('lodash')
+const {get, merge, isEmpty} = require('lodash')
 const safeClassNames = require('posthtml-safe-class-names')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config = {}, direct = false) => {
-  const option = get(config, 'safeClassNames')
-
-  if (option === false) {
-    return html
-  }
-
   /*
-   * Setting it to `true` in the config will run `safeClassNames`
-   * no matter the environment.
+   * Don't run when:
+   * - `config` is falsy or empty
+   * - developing locally and `safeClassNames` is not explicitly `true`
+   * - `safeClassNames` is explicitly `false`
    */
-  if (config.env === 'local' && !option) {
+  if (
+    !config
+    || isEmpty(config)
+    || (get(config, 'env') === 'local' && get(config, 'safeClassNames') !== true)
+    || get(config, 'safeClassNames') === false
+  ) {
     return html
   }