@maizzle/framework 4.4.0-beta.3 → 4.4.0-beta.5

package/package.json

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

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

@@ -67,6 +67,17 @@ module.exports = async (env, spinner, config) => {
       }
     }
 
+    // Create a pipe-delimited list of allowed extensions
+    // We only compile these, the rest are copied as-is
+    const extensions = Array.isArray(templateConfig.filetypes)
+      ? templateConfig.filetypes.join('|')
+      : 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', '')]
+
     // Parse each template source
     await asyncForEach(templateSource, async source => {
       /**
@@ -77,13 +88,22 @@ module.exports = async (env, spinner, config) => {
       const out = fs.lstatSync(source).isFile() ? `${outputDir}/${path.basename(source)}` : outputDir
 
       await fs
-        .copy(source, out)
+        .copy(source, out, {filter: file => {
+          // Do not copy omitted files
+          return !omitted
+            .filter(Boolean)
+            .some(omit => path.normalize(file).includes(path.normalize(omit)))
+        }})
         .then(async () => {
-          const extensions = Array.isArray(templateConfig.filetypes)
-            ? templateConfig.filetypes.join('|')
-            : templateConfig.filetypes || get(templateConfig, 'filetypes', 'html')
+          const allSourceFiles = await glob(`${outputDir}/**/*.+(${extensions})`)
 
-          const templates = await glob(`${outputDir}/**/*.+(${extensions})`)
+          const skipped = Array.isArray(templateConfig.skip) ?
+            templateConfig.skip :
+            [get(templateConfig, 'skip', '')]
+
+          const templates = allSourceFiles.filter(template => {
+            return !skipped.includes(template.replace(`${outputDir}/`, ''))
+          })
 
           if (templates.length === 0) {
             spinner.warn(`Error: no files with the .${extensions} extension found in ${templateConfig.source}`)

package/src/generators/postcss.js

@@ -9,7 +9,9 @@ module.exports = {
     return postcss([
       postcssImport(),
       postcssNested(),
-      maizzleConfig.env === 'local' ? () => {} : mergeLonghand(),
+      get(maizzleConfig, 'shorthandCSS', get(maizzleConfig, 'shorthandInlineCSS')) === true ?
+        mergeLonghand() :
+        () => {},
       ...get(maizzleConfig, 'build.postcss.plugins', [])
     ])
       .process(css, {from: undefined})

package/src/generators/tailwindcss.js

@@ -99,7 +99,9 @@ module.exports = {
     const toProcess = [
       postcssNested(),
       tailwindcss(config),
-      maizzleConfig.env === 'local' ? () => {} : mergeLonghand(),
+      get(maizzleConfig, 'shorthandCSS', get(maizzleConfig, 'shorthandInlineCSS')) === true ?
+        mergeLonghand() :
+        () => {},
       ...get(maizzleConfig, 'build.postcss.plugins', [])
     ]
 

package/src/transformers/baseUrl.js

@@ -5,7 +5,7 @@ const {get, merge, isObject, isEmpty} = require('lodash')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config = {}, direct = false) => {
-  const url = direct ? config : get(config, 'baseURL')
+  const url = direct ? config : get(config, 'baseURL', get(config, 'baseUrl'))
   const posthtmlOptions = merge(defaultConfig, get(config, 'build.posthtml.options', {}))
 
   // Handle `baseUrl` as a string
@@ -19,9 +19,9 @@ module.exports = async (html, config = {}, direct = false) => {
       .then(result => result.html)
   }
 
-  // Handle `baseUrl` as an object
+  // Handle `baseURL` as an object
   if (isObject(url) && !isEmpty(url)) {
-    html = rewriteVMLs(html, url.url)
+    html = rewriteVMLs(html, get(url, 'url', ''))
 
     return posthtml([baseUrl(url)]).process(html, posthtmlOptions).then(result => result.html)
   }

package/src/transformers/index.js

@@ -26,8 +26,8 @@ exports.process = async (html, config) => {
   html = await preventWidows(html, config)
   html = await attributeToStyle(html, config)
   html = await inline(html, config)
-  html = await shorthandInlineCSS(html, config)
   html = await removeUnusedCSS(html, config)
+  html = await shorthandInlineCSS(html, config)
   html = await removeInlineSizes(html, config)
   html = await removeInlineBgColor(html, config)
   html = await removeAttributes(html, config)

package/src/transformers/shorthandInlineCSS.js

@@ -1,19 +1,25 @@
 const posthtml = require('posthtml')
 const {get, merge, isObject, isEmpty} = require('lodash')
-const mergeLonghand = require('posthtml-postcss-merge-longhand')
+const mergeInlineLonghand = require('posthtml-postcss-merge-longhand')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config, direct = false) => {
-  config = direct ? (isObject(config) ? config : true) : get(config, 'shorthandInlineCSS', [])
+  config = direct ?
+    (isObject(config) ? config : true) :
+    get(config, 'shorthandCSS', get(config, 'shorthandInlineCSS', []))
 
   const posthtmlOptions = merge(defaultConfig, get(config, 'build.posthtml.options', {}))
 
   if (typeof config === 'boolean' && config) {
-    html = await posthtml([mergeLonghand()]).process(html, posthtmlOptions).then(result => result.html)
+    html = await posthtml([mergeInlineLonghand()])
+      .process(html, posthtmlOptions)
+      .then(result => result.html)
   }
 
   if (isObject(config) && !isEmpty(config)) {
-    html = await posthtml([mergeLonghand(config)]).process(html, posthtmlOptions).then(result => result.html)
+    html = await posthtml([mergeInlineLonghand(config)])
+      .process(html, posthtmlOptions)
+      .then(result => result.html)
   }
 
   return html