fix: include user-defined components.fileExtension in list of compo…

…nent file extensions to scan for
maizzle · Nov 29, 2024 · 005e2ee · 005e2ee
1 parent 218c1c3
commit 005e2ee
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/src/commands/build.js b/src/commands/build.js
@@ -210,7 +210,25 @@ 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 for components.
+       */
+      const userComponentFileExtensions = get(config, 'components.fileExtension', ['html'])
+
+      const rendered = await render(html, merge(
+        {
+          components: {
+            fileExtension: [
+              ...outputExtensions,
+              ...(new Set([].concat(userComponentFileExtensions))),
+            ],
+          }
+        },
+        config
+      ))
 
       /**
        * Generate plaintext

diff --git a/src/posthtml/defaultComponentsConfig.js b/src/posthtml/defaultComponentsConfig.js
@@ -1,7 +1,7 @@
 export default {
   root: './',
   tag: 'component',
-  fileExtension: 'html',
+  fileExtension: ['html'],
   folders: [
     'layouts',
     'emails',

diff --git a/src/posthtml/index.js b/src/posthtml/index.js
@@ -82,25 +82,32 @@ 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),
     envAttributes(config.env),
     expandLinkTag,
     postcssPlugin,
     fetchPlugin,
-    components(
-      merge(
-        {
-          expressions: merge(
-            { locals },
-            expressionsOptions,
-          )
-        },
-        componentsUserOptions,
-        defaultComponentsConfig
-      )
-    ),
+    components(componentsConfig),
     expandLinkTag,
     postcssPlugin,
     envTags(config.env),