fix #1942 dont process head with cheerio

mjmlio · Aug 11, 2020 · 0b9e2db · 0b9e2db
1 parent 866c4df
commit 0b9e2db
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/packages/mjml-core/src/index.js b/packages/mjml-core/src/index.js
@@ -299,6 +299,23 @@ export default function mjml2html(mjml, options = {}) {
   if (minify && minify !== 'false') {
     content = minifyOutlookConditionnals(content)
   }
+
+  if (!isEmpty(globalDatas.htmlAttributes)) {
+    const $ = cheerio.load(content, {
+      xmlMode: true, // otherwise it may move contents that aren't in any tag
+      decodeEntities: false, // won't escape special characters
+    })
+
+    each(globalDatas.htmlAttributes, (data, selector) => {
+      each(data, (value, attrName) => {
+        $(selector).each(function getAttr() {
+          $(this).attr(attrName, value)
+        })
+      })
+    })
+
+    content = $.root().html()
+  }
 
   content = skeleton({
     content,
@@ -341,23 +358,6 @@ export default function mjml2html(mjml, options = {}) {
     })
   }
 
-  if (!isEmpty(globalDatas.htmlAttributes)) {
-    const $ = cheerio.load(content, {
-      xmlMode: true, // otherwise it may move contents that aren't in any tag
-      decodeEntities: false, // won't escape special characters
-    })
-
-    each(globalDatas.htmlAttributes, (data, selector) => {
-      each(data, (value, attrName) => {
-        $(selector).each(function getAttr() {
-          $(this).attr(attrName, value)
-        })
-      })
-    })
-
-    content = $.root().html()
-  }
-
   content = mergeOutlookConditionnals(content)
 
   return {