@maizzle/framework 5.0.0-beta.36 → 5.0.0-beta.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "5.0.0-beta.36",
+  "version": "5.0.0-beta.38",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "type": "module",

package/src/commands/build.js

@@ -175,7 +175,7 @@ export default async (config = {}) => {
     const outputExtensions = new Set()
 
     for (const pattern of contentPaths) {
-      outputExtensions.add(...getFileExtensionsFromPattern(pattern))
+      getFileExtensionsFromPattern(pattern).map(ext => outputExtensions.add(ext))
     }
 
     /**
@@ -210,7 +210,26 @@ export default async (config = {}) => {
 
       const html = await readFile(templatePath, 'utf8')
 
-      const rendered = await render(html, config)
+      /**
+       * Render the markup.
+       *
+       * Merging a custom `components` object to make sure that file extensions from both
+       * `build.content` * and * `components.fileExtension` are used when scanning for
+       * component files.
+       */
+      const userComponentFileExtensions = get(config, 'components.fileExtension', ['html'])
+
+      const rendered = await render(html, merge(
+        {
+          components: {
+            fileExtension: [
+              ...outputExtensions,
+              ...(new Set([].concat(userComponentFileExtensions))),
+            ],
+          }
+        },
+        config
+      ))
 
       /**
        * Generate plaintext

package/src/posthtml/defaultComponentsConfig.js

@@ -1,7 +1,7 @@
 export default {
   root: './',
   tag: 'component',
-  fileExtension: 'html',
+  fileExtension: ['html'],
   folders: [
     'layouts',
     'emails',

package/src/posthtml/index.js

@@ -82,6 +82,24 @@ export async function process(html = '', config = {}) {
     )
   )
 
+  const componentsConfig = merge(
+    {
+      expressions: merge(
+        { locals },
+        expressionsOptions,
+      )
+    },
+    componentsUserOptions,
+    defaultComponentsConfig
+  )
+
+  // Ensure `fileExtension` is array and  has no duplicates
+  componentsConfig.fileExtension = [...new Set(
+    Array.isArray(componentsConfig.fileExtension)
+      ? componentsConfig.fileExtension
+      : [componentsConfig.fileExtension]
+  )]
+
   return posthtml([
     ...get(config, 'posthtml.plugins.before', []),
     envTags(config.env),
@@ -89,18 +107,7 @@ export async function process(html = '', config = {}) {
     expandLinkTag,
     postcssPlugin,
     fetchPlugin,
-    components(
-      merge(
-        {
-          expressions: merge(
-            { locals },
-            expressionsOptions,
-          )
-        },
-        componentsUserOptions,
-        defaultComponentsConfig
-      )
-    ),
+    components(componentsConfig),
     expandLinkTag,
     postcssPlugin,
     envTags(config.env),

package/src/transformers/index.js

@@ -162,9 +162,10 @@ export async function run(html = '', config = {}) {
    *
    * Add a base URL to relative paths.
    */
-  if (get(config, 'baseURL', get(config, 'baseUrl'))) {
+  const baseConfig = get(config, 'baseURL', get(config, 'baseUrl'))
+  if (baseConfig) {
     posthtmlPlugins.push(
-      baseUrl(get(config, 'baseURL', get(config, 'baseUrl', {})))
+      baseUrl(baseConfig)
     )
   }
 

package/types/config.d.ts

@@ -53,12 +53,17 @@ export default interface Config {
      * ```
      * export default {
      *   attributes: {
-     *     remove: ['width', 'height'],
+     *     remove: [
+     *      {
+     *        name: 'width',
+     *        value: '100', // or RegExp: /\d/
+     *      },
+     *     ], // or as array: ['width', 'height']
      *   }
      * }
      * ```
      */
-    remove?: Record<string, string[]>;
+    remove?: Array<string | { name: string; value: string | RegExp }>;
   }
 
   /**