@maizzle/framework 4.7.3 → 4.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "4.7.3",
+  "version": "4.7.5",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "main": "src/index.js",
@@ -46,9 +46,9 @@
     "browser-sync": "^3.0.2",
     "color-shorthand-hex-to-six-digit": "^3.0.2",
     "email-comb": "^5.2.0",
+    "fast-glob": "^3.3.2",
     "front-matter": "^4.0.0",
     "fs-extra": "^11.2.0",
-    "glob-promise": "^4.1.0",
     "html-crush": "^4.0.0",
     "is-url-superb": "^5.0.0",
     "juice": "^10.0.0",
@@ -71,13 +71,14 @@
     "posthtml-postcss-merge-longhand": "^2.0.1",
     "posthtml-safe-class-names": "^3.0.0",
     "posthtml-url-parameters": "^2.0.0",
-    "prettier": "^3.1.1",
+    "pretty": "^2.0.0",
     "query-string": "^7.1.3",
     "string-remove-widows": "^2.1.0",
     "string-strip-html": "^8.2.0",
     "tailwindcss": "^3.2.7"
   },
   "devDependencies": {
+    "@types/js-beautify": "^1.14.0",
     "@types/markdown-it": "^13.0.0",
     "ava": "^5.2.0",
     "c8": "^9.0.0",

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

@@ -1,6 +1,6 @@
 const path = require('path')
 const fs = require('fs-extra')
-const glob = require('glob-promise')
+const {glob} = require('fast-glob')
 const {get, merge, isEmpty} = require('lodash')
 
 const Config = require('../config')
@@ -73,9 +73,10 @@ 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')
+    const fileTypes = get(templateConfig, 'filetypes', 'html')
+    const extensionsList = Array.isArray(fileTypes)
+      ? fileTypes.join(',')
+      : fileTypes.split('|').join(',')
 
     // List of files that won't be copied to the output directory
     const omitted = Array.isArray(templateConfig.omit)
@@ -101,7 +102,10 @@ module.exports = async (env, spinner, config) => {
             .some(omit => path.normalize(file).includes(path.normalize(omit)))
         }})
         .then(async () => {
-          const allSourceFiles = await glob(`${outputDir}/**/*.+(${extensions})`)
+          const extensions = extensionsList.includes(',')
+            ? `{${extensionsList}}`
+            : extensionsList
+          const allSourceFiles = await glob(`${outputDir}/**/*.${extensions}`)
 
           const skipped = Array.isArray(templateConfig.skip) ?
             templateConfig.skip :
@@ -223,7 +227,7 @@ module.exports = async (env, spinner, config) => {
             }
           }
 
-          await glob(path.join(templateConfig.destination.path, '/**/*.*'))
+          await glob(path.join(templateConfig.destination.path, '/**').replace(/\\/g, '/'))
             .then(contents => {
               files = [...new Set([...files, ...contents])]
             })

package/src/index.d.ts

@@ -1,5 +1,5 @@
 import type {StringifyOptions} from 'query-string';
-import type {Config as PrettierOptions} from 'prettier';
+import type {CoreBeautifyOptions} from 'js-beautify';
 import type {Options as MarkdownItOptions} from 'markdown-it';
 import type {Opts as PlaintextOptions} from 'string-strip-html';
 
@@ -1773,7 +1773,7 @@ declare namespace MaizzleFramework {
     }
     ```
     */
-    prettify?: boolean | PrettierOptions;
+    prettify?: boolean | CoreBeautifyOptions;
 
     /**
     Minify the compiled HTML email code.
@@ -2041,9 +2041,9 @@ declare namespace MaizzleFramework {
   /**
   Pretty print HTML code so that it's nicely indented and more human-readable.
   @param {string} html The HTML string to prettify.
-  @param {PrettierOptions} [options] Options to pass to the prettifier.
+  @param {CoreBeautifyOptions} [options] Options to pass to the prettifier.
   */
-  function prettify(html: string, options?: PrettierOptions): string;
+  function prettify(html: string, options?: CoreBeautifyOptions): string;
 
   /**
   Prepend a string to sources and hrefs in an HTML string.

package/src/transformers/prettify.js

@@ -1,69 +1,27 @@
-const {format} = require('prettier')
+/* eslint-disable camelcase */
+const pretty = require('pretty')
 const {get, merge, isEmpty, isObject} = require('lodash')
 
 module.exports = async (html, config = {}, direct = false) => {
-  config = direct ? config : get(config, 'prettify')
-
   const defaultConfig = {
-    parser: 'html',
-    printWidth: 500,
-    htmlWhitespaceSensitivity: 'ignore',
-    xmlMode: get(config, 'posthtml.options.xmlMode', false),
-    rewriteSelfClosing: true,
-    selfClosingTags: [
-      'area',
-      'base',
-      'br',
-      'col',
-      'embed',
-      'hr',
-      'img',
-      'input',
-      'link',
-      'meta',
-      'param',
-      'source',
-      'track',
-      'wbr'
-    ]
+    space_around_combinator: true, // Preserve space around CSS selector combinators
+    newline_between_rules: false, // Remove empty lines between CSS rules
+    indent_inner_html: false, // Helps reduce file size
+    extra_liners: [] // Don't add extra new line before any tag
   }
 
+  config = direct ? config : get(config, 'prettify')
+
   // Don't prettify if not explicitly enabled in config
   if (!config || (isObject(config) && isEmpty(config))) {
     return html
   }
 
   if (typeof config === 'boolean' && config) {
-    return format(html, defaultConfig).then(html => reFormat(html, defaultConfig))
+    return pretty(html, defaultConfig)
   }
 
   config = merge(defaultConfig, config)
 
-  return format(html, config).then(html => reFormat(html, config))
-}
-
-const reFormat = (html, config) => {
-  if (/<!doctype html>/i.test(html) && !config.xmlMode && config.rewriteSelfClosing) {
-    html = html.replace(new RegExp(`<(${config.selfClosingTags.join('|')})\s?([^>]*?)\s?\/>`, 'g'), (match, p1, p2) => {
-      return `<${p1}${p2.trimEnd()}>`
-    })
-  }
-
-  return html
-    // Fix style="" attributes broken down on multiple lines
-    .replace(/(\s+style="\s+)([\s\S]*?)(\s+")/g, (match, p1, p2, p3) => {
-      return p1.replace(/\n\s+?(style)/g, ' $1').trimEnd()
-        + p2.replace(/\s+/g, ' ').trim()
-        + p3.trim()
-    })
-    // Fix closing </pre> tags broken down on multiple lines (</pre>\n\s+>)
-    .replace(/(<\/pre)\s+>/g, '$1>')
-    // Undo escaping of quotes in attribute values
-    .replace(/="(.*?)"/g, (match, p1) => {
-      return `="${p1.replace(/&quot;/g, '\'')}"`
-    })
-    // Fix <tag \n\s+{attrs}\n\s+> => <tag {attrs}>
-    .replace(/<([^>]+)\n\s*([^>]+)\n\s*>/g, '<$1 $2>')
-    // Fix <tag {attrs}\n[\s\t]*> => <tag {attrs}>
-    .replace(/<([^>]+)\n\s*>/g, '<$1>')
+  return pretty(html, config)
 }