@maizzle/framework 4.6.1 → 4.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "4.6.1",
+  "version": "4.6.3",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "main": "src/index.js",
@@ -43,15 +43,15 @@
   "dependencies": {
     "@maizzle/cli": "^1.5.1",
     "autoprefixer": "^10.4.14",
-    "browser-sync": "^2.28.3",
+    "browser-sync": "^3.0.2",
     "color-shorthand-hex-to-six-digit": "^3.0.2",
     "email-comb": "^5.2.0",
     "front-matter": "^4.0.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^11.2.0",
     "glob-promise": "^4.1.0",
     "html-crush": "^4.0.0",
     "is-url-superb": "^5.0.0",
-    "juice": "^9.0.0",
+    "juice": "^10.0.0",
     "lodash": "^4.17.20",
     "ora": "^5.1.0",
     "postcss": "^8.4.21",

package/src/commands/serve.js

@@ -6,8 +6,8 @@ const Config = require('../generators/config')
 const buildToFile = require('../commands/build')
 const renderToString = require('../functions/render')
 
-const {get, isObject} = require('lodash')
-const {clearConsole, merge} = require('../utils/helpers')
+const {get, merge, isObject} = require('lodash')
+const {clearConsole} = require('../utils/helpers')
 
 /**
  * Initialize Browsersync on-demand

package/src/generators/config.js

@@ -1,5 +1,6 @@
 const path = require('path')
-const {merge, requireUncached} = require('../utils/helpers')
+const {merge} = require('lodash')
+const {requireUncached} = require('../utils/helpers')
 
 const baseConfigFileNames = [
   './maizzle.config.js',

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

@@ -1,12 +1,11 @@
 const path = require('path')
 const fs = require('fs-extra')
 const glob = require('glob-promise')
-const {get, isEmpty} = require('lodash')
-const {merge} = require('../../utils/helpers')
+const {get, merge, isEmpty} = require('lodash')
 
 const Config = require('../config')
-const Tailwind = require('../tailwindcss')
 const Plaintext = require('../plaintext')
+const Tailwind = require('../tailwindcss')
 
 const render = require('./to-string')
 

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

@@ -1,10 +1,9 @@
 const fm = require('front-matter')
-const {get} = require('lodash')
+const Config = require('../config')
+const {get, merge} = require('lodash')
 const posthtml = require('../posthtml')
-const {merge} = require('../../utils/helpers')
-const Transformers = require('../../transformers')
 const Tailwind = require('../tailwindcss')
-const Config = require('../config')
+const Transformers = require('../../transformers')
 
 module.exports = async (html, options) => {
   process.env.NODE_ENV = get(options, 'maizzle.env', 'local')

package/src/generators/plaintext.js

@@ -1,7 +1,6 @@
 const path = require('path')
-const {get} = require('lodash')
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
+const {get, merge} = require('lodash')
 const {stripHtml} = require('string-strip-html')
 const defaultConfig = require('./posthtml/defaultConfig')
 

package/src/generators/posthtml/index.js

@@ -1,9 +1,8 @@
 const fm = require('front-matter')
 const posthtml = require('posthtml')
-const {get, omit} = require('lodash')
 const fetch = require('posthtml-fetch')
 const layouts = require('posthtml-extend')
-const {merge} = require('../../utils/helpers')
+const {get, merge, omit} = require('lodash')
 const components = require('posthtml-component')
 const defaultPosthtmlConfig = require('./defaultConfig')
 const defaultComponentsConfig = require('./defaultComponentsConfig')

package/src/generators/tailwindcss.js

@@ -3,9 +3,9 @@ const fs = require('fs-extra')
 const postcss = require('postcss')
 const tailwindcss = require('tailwindcss')
 const postcssImport = require('postcss-import')
-const {get, isObject, isEmpty} = require('lodash')
+const {get, merge, isObject, isEmpty} = require('lodash')
 const postcssNested = require('tailwindcss/nesting')
-const {merge, requireUncached} = require('../utils/helpers')
+const {requireUncached} = require('../utils/helpers')
 const mergeLonghand = require('postcss-merge-longhand')
 const defaultComponentsConfig = require('./posthtml/defaultComponentsConfig')
 

package/src/transformers/attributeToStyle.js

@@ -1,8 +1,14 @@
+const {
+  get,
+  merge,
+  forEach,
+  intersection,
+  keys,
+  isEmpty
+} = require('lodash')
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
 const parseAttrs = require('posthtml-attrs-parser')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
-const {get, forEach, intersection, keys, isEmpty} = require('lodash')
 
 module.exports = async (html, config = {}, direct = false) => {
   const posthtmlOptions = merge(defaultConfig, get(config, 'build.posthtml.options', {}))

package/src/transformers/baseUrl.js

@@ -1,8 +1,7 @@
 const posthtml = require('posthtml')
 const isUrl = require('is-url-superb')
-const {merge} = require('../utils/helpers')
 const baseUrl = require('posthtml-base-url')
-const {get, isObject, isEmpty} = require('lodash')
+const {get, merge, isObject, isEmpty} = require('lodash')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config = {}, direct = false) => {

package/src/transformers/extraAttributes.js

@@ -1,6 +1,5 @@
 const posthtml = require('posthtml')
-const {get, isObject} = require('lodash')
-const {merge} = require('../utils/helpers')
+const {get, merge, isObject} = require('lodash')
 const addAttributes = require('posthtml-extra-attributes')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/transformers/filters/index.js

@@ -1,6 +1,5 @@
 const posthtml = require('posthtml')
-const {get, omit, has} = require('lodash')
-const {merge} = require('../../utils/helpers')
+const {get, merge, omit, has} = require('lodash')
 const defaultFilters = require('./defaultFilters')
 const PostCSS = require('../../generators/postcss')
 const posthtmlContent = require('posthtml-content')

package/src/transformers/index.js

@@ -27,10 +27,10 @@ exports.process = async (html, config) => {
   html = await attributeToStyle(html, config)
   html = await inline(html, config)
   html = await removeUnusedCSS(html, config)
+  html = await removeAttributes(html, config)
   html = await shorthandInlineCSS(html, config)
   html = await removeInlineSizes(html, config)
   html = await removeInlineBgColor(html, config)
-  html = await removeAttributes(html, config)
   html = await applyExtraAttributes(html, config)
   html = await applyBaseUrl(html, config)
   html = await addURLParams(html, config)

package/src/transformers/markdown.js

@@ -1,6 +1,5 @@
-const {get} = require('lodash')
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
+const {get, merge} = require('lodash')
 const markdown = require('posthtml-markdownit')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/transformers/posthtmlMso.js

@@ -1,7 +1,6 @@
-const {get} = require('lodash')
 const posthtml = require('posthtml')
+const {get, merge} = require('lodash')
 const outlook = require('posthtml-mso')
-const {merge} = require('../utils/helpers')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config) => {

package/src/transformers/prettify.js

@@ -1,7 +1,6 @@
 /* eslint-disable camelcase */
 const pretty = require('pretty')
-const {merge} = require('../utils/helpers')
-const {get, isEmpty, isObject} = require('lodash')
+const {get, merge, isEmpty, isObject} = require('lodash')
 
 module.exports = async (html, config = {}, direct = false) => {
   const defaultConfig = {

package/src/transformers/preventWidows.js

@@ -1,6 +1,5 @@
 const posthtml = require('posthtml')
-const {get, isEmpty} = require('lodash')
-const {merge} = require('../utils/helpers')
+const {get, merge, isEmpty} = require('lodash')
 const {removeWidows} = require('string-remove-widows')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/transformers/removeAttributes.js

@@ -1,6 +1,5 @@
-const {get} = require('lodash')
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
+const {get, merge} = require('lodash')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config = {}, direct = false) => {

package/src/transformers/removeInlineBackgroundColor.js

@@ -1,7 +1,7 @@
 const posthtml = require('posthtml')
-const {get, isEmpty} = require('lodash')
+const {get, merge, isEmpty} = require('lodash')
 const parseAttrs = require('posthtml-attrs-parser')
-const {merge, toStyleString} = require('../utils/helpers')
+const {toStyleString} = require('../utils/helpers')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config = {}, direct = false) => {

package/src/transformers/removeInlineSizes.js

@@ -1,7 +1,7 @@
 const posthtml = require('posthtml')
-const {get, isEmpty} = require('lodash')
+const {get, merge, isEmpty} = require('lodash')
 const parseAttrs = require('posthtml-attrs-parser')
-const {merge, toStyleString} = require('../utils/helpers')
+const {toStyleString} = require('../utils/helpers')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 
 module.exports = async (html, config = {}, direct = false) => {
@@ -18,8 +18,6 @@ module.exports = async (html, config = {}, direct = false) => {
 
 const removeInlineSizes = (mappings = {}) => tree => {
   const process = node => {
-    const attrs = parseAttrs(node.attrs)
-
     Object.entries(mappings).forEach(([attribute, tags]) => {
       tags = Object.values(tags).map(tag => tag.toLowerCase())
 
@@ -27,6 +25,8 @@ const removeInlineSizes = (mappings = {}) => tree => {
         return node
       }
 
+      const attrs = parseAttrs(node.attrs)
+
       tags.forEach(() => {
         if (get(node, 'attrs.style')) {
           delete attrs.style[attribute]

package/src/transformers/removeInlinedSelectors.js

@@ -1,7 +1,6 @@
 const postcss = require('postcss')
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
-const {get, has, remove} = require('lodash')
+const {get, merge, has, remove} = require('lodash')
 const parseAttrs = require('posthtml-attrs-parser')
 const matchHelper = require('posthtml-match-helper')
 const defaultConfig = require('../generators/posthtml/defaultConfig')

package/src/transformers/removeUnusedCss.js

@@ -1,6 +1,5 @@
 const {comb} = require('email-comb')
-const {merge} = require('../utils/helpers')
-const {get, isEmpty, isObject} = require('lodash')
+const {get, merge, isEmpty, isObject} = require('lodash')
 const removeInlinedClasses = require('./removeInlinedSelectors')
 
 module.exports = async (html, config = {}, direct = false) => {

package/src/transformers/safeClassNames.js

@@ -1,6 +1,5 @@
 const posthtml = require('posthtml')
-const {get, isEmpty} = require('lodash')
-const {merge} = require('../utils/helpers')
+const {get, merge, isEmpty} = require('lodash')
 const safeClassNames = require('posthtml-safe-class-names')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/transformers/shorthandInlineCSS.js

@@ -1,6 +1,5 @@
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
-const {get, isObject, isEmpty} = require('lodash')
+const {get, merge, isObject, isEmpty} = require('lodash')
 const mergeInlineLonghand = require('posthtml-postcss-merge-longhand')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/transformers/sixHex.js

@@ -1,6 +1,5 @@
-const {get} = require('lodash')
 const posthtml = require('posthtml')
-const {merge} = require('../utils/helpers')
+const {get, merge} = require('lodash')
 const {conv} = require('color-shorthand-hex-to-six-digit')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/transformers/urlParameters.js

@@ -1,6 +1,5 @@
 const posthtml = require('posthtml')
-const {get, isEmpty} = require('lodash')
-const {merge} = require('../utils/helpers')
+const {get, merge, isEmpty} = require('lodash')
 const urlParams = require('posthtml-url-parameters')
 const defaultConfig = require('../generators/posthtml/defaultConfig')
 

package/src/utils/helpers.js

@@ -1,5 +1,3 @@
-const {mergeWith} = require('lodash')
-
 module.exports = {
   requireUncached: module => {
     try {
@@ -11,24 +9,5 @@ module.exports = {
   },
   // https://github.com/lukeed/console-clear
   clearConsole: () => process.stdout.write('\x1B[H\x1B[2J'),
-  toStyleString: (object = {}) => Object.entries(object).map(([k, v]) => `${k}: ${v}`).join('; '),
-  merge: (...objects) => {
-    if (objects.length < 2) {
-      return objects[0]
-    }
-
-    let merged = {}
-
-    for (const object of objects) {
-      merged = mergeWith(merged, object, (existingValue, newValue) => {
-        if (Array.isArray(existingValue) && Array.isArray(newValue)) {
-          return [...existingValue, ...newValue]
-        }
-
-        return undefined
-      })
-    }
-
-    return merged
-  }
+  toStyleString: (object = {}) => Object.entries(object).map(([k, v]) => `${k}: ${v}`).join('; ')
 }