fix: default posthtml options

get parser directives working again

Author: cossssmin

src/generators/plaintext.js

@@ -3,8 +3,8 @@ import posthtml from 'posthtml'
 import get from 'lodash-es/get.js'
 import { defu as merge } from 'defu'
 import { stripHtml } from 'string-strip-html'
-import defaultConfig from '../posthtml/defaultConfig.js'
 import { writeFile, lstat, mkdir } from 'node:fs/promises'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 
 /**
  * Removes HTML tags from a given HTML string based on
@@ -46,7 +46,7 @@ const removeTags = ({ tag = 'not-plaintext', html = '', config = {} }) => {
     return tree.walk(process)
   }
 
-  const posthtmlOptions = merge(defaultConfig, config)
+  const posthtmlOptions = merge(config, getPosthtmlOptions())
 
   return posthtml([posthtmlPlugin()]).process(html, { ...posthtmlOptions }).then(res => res.html)
 }
@@ -95,7 +95,7 @@ export async function handlePlaintextTags(html = '', config = {}) {
     return tree.walk(process)
   }
 
-  const posthtmlOptions = merge(defaultConfig, config)
+  const posthtmlOptions = merge(config, getPosthtmlOptions())
 
   return posthtml([posthtmlPlugin()]).process(html, { ...posthtmlOptions }).then(res => res.html)
 }

src/generators/render.js

@@ -4,7 +4,7 @@ import { cwd } from 'node:process'
 import { defu as merge } from 'defu'
 import expressions from 'posthtml-expressions'
 import { parseFrontMatter } from '../utils/node.js'
-import defaultConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 import { process as compilePostHTML } from '../posthtml/index.js'
 import { run as useTransformers } from '../transformers/index.js'
 
@@ -41,7 +41,7 @@ export async function render(html = '', config = {}) {
       })
     ]
   )
-    .process(matter, defaultConfig)
+    .process(matter, getPosthtmlOptions())
     .then(({ html }) => parseFrontMatter(`---${html}\n---`))
 
   const templateConfig = merge(matterData, config)

src/posthtml/defaultComponentsConfig.js

@@ -8,9 +8,4 @@ export default {
     missingLocal: '{local}',
     strictMode: false,
   },
-  parserOptions: {
-    directives: [
-      { name: '?php', start: '<', end: '>' },
-    ]
-  },
 }

src/posthtml/defaultConfig.js

@@ -1,7 +1,14 @@
-export default {
-  recognizeNoValueAttribute: true,
-  recognizeSelfClosing: true,
-  directives: [
-    { name: '?php', start: '<', end: '>' },
-  ],
+import { defu as merge } from 'defu'
+
+export function getPosthtmlOptions(userConfigOptions = {}) {
+  return merge(
+    userConfigOptions,
+    {
+      recognizeNoValueAttribute: true,
+      recognizeSelfClosing: true,
+      directives: [
+        { name: '?php', start: '<', end: '>' },
+      ],
+    }
+  )
 }

src/posthtml/index.js

@@ -7,9 +7,9 @@ import posthtmlFetch from 'posthtml-fetch'
 import envTags from './plugins/envTags.js'
 import components from 'posthtml-component'
 import posthtmlPostcss from 'posthtml-postcss'
-import defaultPosthtmlConfig from './defaultConfig.js'
 import expandLinkTag from './plugins/expandLinkTag.js'
 import envAttributes from './plugins/envAttributes.js'
+import { getPosthtmlOptions } from './defaultConfig.js'
 
 // PostCSS
 import tailwindcss from 'tailwindcss'
@@ -36,7 +36,7 @@ export async function process(html = '', config = {}) {
     )
   )
 
-  const posthtmlOptions = merge(get(config, 'posthtml.options', {}), defaultPosthtmlConfig)
+  const posthtmlOptions = getPosthtmlOptions(get(config, 'posthtml.options', {}))
 
   const componentsUserOptions = get(config, 'components', {})
 

src/transformers/addAttributes.js

@@ -1,6 +1,5 @@
 import posthtml from 'posthtml'
 import { defu as merge } from 'defu'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
 import addAttributesPlugin from 'posthtml-extra-attributes'
 
 export default function posthtmlPlugin(attributes = {}) {
@@ -25,6 +24,6 @@ export async function addAttributes(html = '', attributes = {}, posthtmlOptions
   return posthtml([
     posthtmlPlugin(attributes)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/attributeToStyle.js

@@ -1,11 +1,9 @@
 import posthtml from 'posthtml'
 import get from 'lodash-es/get.js'
-import { defu as merge } from 'defu'
 import keys from 'lodash-es/keys.js'
 import forEach from 'lodash-es/forEach.js'
 import parseAttrs from 'posthtml-attrs-parser'
 import intersection from 'lodash-es/intersection.js'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
 
 const posthtmlPlugin = (attributes = []) => tree => {
   if (!Array.isArray(attributes)) {
@@ -87,6 +85,6 @@ export async function attributeToStyle(html = '', attributes = [], posthtmlOptio
   return posthtml([
     posthtmlPlugin(attributes)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/baseUrl.js

@@ -1,13 +1,14 @@
 import posthtml from 'posthtml'
 import isUrl from 'is-url-superb'
 import get from 'lodash-es/get.js'
-import { defu as merge } from 'defu'
 import baseUrl from 'posthtml-base-url'
 import { render } from 'posthtml-render'
 import isEmpty from 'lodash-es/isEmpty.js'
 import isObject from 'lodash-es/isObject.js'
 import { parser as parse } from 'posthtml-parser'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
+
+const posthtmlOptions = getPosthtmlOptions()
 
 const posthtmlPlugin = url => tree => {
   // Handle `baseURL` as a string
@@ -19,7 +20,7 @@ const posthtmlPlugin = url => tree => {
       allTags: true,
       styleTag: true,
       inlineCss: true
-    })(parse(html, posthtmlConfig))
+    })(parse(html, posthtmlOptions))
   }
 
   // Handle `baseURL` as an object
@@ -31,7 +32,6 @@ const posthtmlPlugin = url => tree => {
       allTags,
       tags,
       url: baseURL,
-      ...posthtmlOptions
     } = url
 
     return baseUrl({
@@ -40,7 +40,7 @@ const posthtmlPlugin = url => tree => {
       allTags,
       tags,
       url: baseURL,
-    })(parse(html, merge(posthtmlConfig, posthtmlOptions)))
+    })(parse(html, posthtmlOptions))
   }
 
   return tree
@@ -52,7 +52,7 @@ export async function addBaseUrl(html = '', options = {}, posthtmlOptions = {})
   return posthtml([
     posthtmlPlugin(options)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, getPosthtmlOptions())
     .then(result => result.html)
 }
 

src/transformers/comb.js

@@ -4,7 +4,7 @@ import { defu as merge } from 'defu'
 import { render } from 'posthtml-render'
 import { comb as emailComb } from 'email-comb'
 import { parser as parse } from 'posthtml-parser'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 
 const posthtmlPlugin = options => tree => {
   const defaultSafelist = [
@@ -35,17 +35,18 @@ const posthtmlPlugin = options => tree => {
 
   options = merge(options, defaultOptions)
 
+  const posthtmlConfig = getPosthtmlOptions()
   const { result: html } = emailComb(render(tree), options)
 
   return parse(html, posthtmlConfig)
 }
 
 export default posthtmlPlugin
 
-export async function comb(html = '', options = {}, posthtmlOptions = {}) {
+export async function comb(html = '', pluginOptions = {}, posthtmlOptions = {}) {
   return posthtml([
-    posthtmlPlugin(options)
+    posthtmlPlugin(pluginOptions)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/filters/index.js

@@ -1,7 +1,6 @@
 import posthtml from 'posthtml'
 import { defu as merge } from 'defu'
 import posthtmlContent from 'posthtml-content'
-import posthtmlConfig from '../../posthtml/defaultConfig.js'
 import { filters as defaultFilters } from './defaultFilters.js'
 
 export default function posthtmlPlugin(filters = {}) {
@@ -14,6 +13,6 @@ export async function filters(html = '', filters = {}, posthtmlOptions = {}) {
   return posthtml([
     posthtmlPlugin(filters)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/index.js

@@ -22,7 +22,7 @@ import replaceStrings from './replaceStrings.js'
 import attributeToStyle from './attributeToStyle.js'
 import removeAttributes from './removeAttributes.js'
 
-import defaultPosthtmlConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 
 /**
  * Use Maizzle Transformers on an HTML string.
@@ -37,10 +37,7 @@ import defaultPosthtmlConfig from '../posthtml/defaultConfig.js'
 export async function run(html = '', config = {}) {
   const posthtmlPlugins = []
 
-  const posthtmlConfig = merge(
-    get(config, 'posthtml.options', {}),
-    defaultPosthtmlConfig
-  )
+  const posthtmlConfig = getPosthtmlOptions(get(config, 'posthtml.options', {}))
 
   /**
    * 1. Core transformers

src/transformers/inline.js

@@ -12,10 +12,10 @@ import isObject from 'lodash-es/isObject.js'
 import { parser as parse } from 'posthtml-parser'
 import { parseCSSRule } from '../utils/string.js'
 import { useAttributeSizes } from './useAttributeSizes.js'
-import defaultPostHTMLConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 
 const posthtmlPlugin = (options = {}) => tree => {
-  return inline(render(tree), options).then(html => parse(html, defaultPostHTMLConfig))
+  return inline(render(tree), options).then(html => parse(html, getPosthtmlOptions()))
 }
 
 export default posthtmlPlugin
@@ -150,7 +150,7 @@ export async function inline(html = '', options = {}) {
       rule.walkDecls(decl => {
         // Resolve calc() values to static values
         if (options.resolveCalc) {
-          decl.value = decl.value.includes('calc(') ? calc(decl.value, {precision: 2}) : decl.value
+          decl.value = decl.value.includes('calc(') ? calc(decl.value, { precision: 2 }) : decl.value
         }
 
         declarations.add(decl)
@@ -164,10 +164,10 @@ export async function inline(html = '', options = {}) {
        */
       if (options.resolveCSSVariables) {
         Array.from(declarations)
-        /**
-         * Consider only declarations with a value that includes any of the other declarations' property
-         * So a decl like color(var(--text-color)) will be removed if there's a decl with a property of --text-color
-         *  */
+          /**
+           * Consider only declarations with a value that includes any of the other declarations' property
+           * So a decl like color(var(--text-color)) will be removed if there's a decl with a property of --text-color
+           *  */
           .filter(decl =>
             Array.from(declarations).some(otherDecl => decl.value.includes(otherDecl.prop))
             || decl.prop.startsWith('--')
@@ -216,7 +216,7 @@ export async function inline(html = '', options = {}) {
               let { property, value } = parseCSSRule(i)
 
               if (value && options.resolveCalc) {
-                value = value.includes('calc') ? calc(value, {precision: 2}) : value
+                value = value.includes('calc') ? calc(value, { precision: 2 }) : value
               }
 
               if (value && options.preferUnitlessValues) {

src/transformers/markdown.js

@@ -1,7 +1,5 @@
 import posthtml from 'posthtml'
-import { defu as merge } from 'defu'
 import md from 'posthtml-markdownit'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
 
 export async function markdown(input = '', options = {}, posthtmlOptions = {}) {
   /**
@@ -23,6 +21,6 @@ export async function markdown(input = '', options = {}, posthtmlOptions = {}) {
   return posthtml([
     md(options)
   ])
-    .process(input, merge(posthtmlOptions, posthtmlConfig))
+    .process(input, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/minify.js

@@ -3,17 +3,17 @@ import { crush } from 'html-crush'
 import { defu as merge } from 'defu'
 import { render } from 'posthtml-render'
 import { parser as parse } from 'posthtml-parser'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
-import defaultPostHTMLConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 
 const posthtmlPlugin = (options = {}) => tree => {
   options = merge(options, {
     removeLineBreaks: true,
   })
 
+  const posthtmlConfig = getPosthtmlOptions()
   const { result: html } = crush(render(tree), options)
 
-  return parse(html, defaultPostHTMLConfig)
+  return parse(html, posthtmlConfig)
 }
 
 export default posthtmlPlugin
@@ -22,6 +22,6 @@ export async function minify(html = '', options = {}, posthtmlOptions = {}) {
   return posthtml([
     posthtmlPlugin(options)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/posthtmlMso.js

@@ -1,7 +1,5 @@
 import posthtml from 'posthtml'
-import { defu as merge } from 'defu'
 import posthtmlMso from 'posthtml-mso'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
 
 export default function posthtmlPlugin(options = {}) {
   return posthtmlMso(options)
@@ -11,6 +9,6 @@ export async function useMso(html = '', options = {}, posthtmlOptions = {}) {
   return posthtml([
     posthtmlPlugin(options)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }

src/transformers/prettify.js

@@ -3,7 +3,7 @@ import posthtml from 'posthtml'
 import { defu as merge } from 'defu'
 import { render } from 'posthtml-render'
 import { parser as parse } from 'posthtml-parser'
-import posthtmlConfig from '../posthtml/defaultConfig.js'
+import { getPosthtmlOptions } from '../posthtml/defaultConfig.js'
 
 const posthtmlPlugin = (options = {}) => tree => {
   const defaultConfig = {
@@ -15,7 +15,7 @@ const posthtmlPlugin = (options = {}) => tree => {
 
   const config = merge(options, defaultConfig)
 
-  return parse(pretty(render(tree), config), posthtmlConfig)
+  return parse(pretty(render(tree), config), getPosthtmlOptions())
 }
 
 export default posthtmlPlugin
@@ -24,6 +24,6 @@ export async function prettify(html = '', options = {}, posthtmlOptions = {}) {
   return posthtml([
     posthtmlPlugin(options)
   ])
-    .process(html, merge(posthtmlOptions, posthtmlConfig))
+    .process(html, posthtmlOptions)
     .then(result => result.html)
 }