Better prettyPrinting of compiled HTML <a> tags.

oddbird · Dec 14, 2017 · 72399e7 · 72399e7
1 parent d0e982d
commit 72399e7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Herman Changelog
 
 
+## Unreleased
+
+- CHANGE: Use `installJinjaCompat` for default Nunjucks environment.
+- BUGFIX: Fix prettyPrint for compiled HTML/Nunjucks.
+
+
 ## 1.0.0-rc.7: 2017-12-12
 
 - NEW: Support SassDoc [`googleAnalytics`][googleAnalytics] and

diff --git a/docs/CHANGELOG.html b/docs/CHANGELOG.html
@@ -251,6 +251,11 @@ <h3 data-sassdoc="nav-title">
 
   <div class="text-block">
     <h1 id="herman-changelog">Herman Changelog</h1>
+<h2 id="unreleased">Unreleased</h2>
+<ul>
+<li>CHANGE: Use <code>installJinjaCompat</code> for default Nunjucks<span class="widont">&nbsp;</span>environment.</li>
+<li>BUGFIX: Fix prettyPrint for compiled<span class="widont">&nbsp;</span>HTML/Nunjucks.</li>
+</ul>
 <h2 id="1-0-0-rc-7-2017-12-12">1.0.0-rc.7: 2017-12-12</h2>
 <ul>
 <li>NEW: Support SassDoc <a href="http://sassdoc.com/customising-the-view/#google-analytics"><code>googleAnalytics</code></a> and

diff --git a/lib/annotations/example.js b/lib/annotations/example.js
@@ -4,6 +4,7 @@ const beautify = require('html').prettyPrint;
 const path = require('path');
 const Promise = require('bluebird');
 const sass = require('node-sass');
+const stripIndent = require('strip-indent');
 
 const getNunjucksEnv = require('../utils/getNunjucksEnv');
 const renderIframe = require('../renderIframe');
@@ -40,7 +41,10 @@ module.exports = env => {
         }
         item.example.forEach(exampleItem => {
           if (exampleItem.type === 'html') {
-            exampleItem.rendered = beautify(exampleItem.code, beautifyOpts);
+            exampleItem.rendered = beautify(
+              stripIndent(exampleItem.code),
+              beautifyOpts
+            );
           } else if (exampleItem.type === 'njk') {
             if (!customNjkEnv) {
               customNjkEnv = getNunjucksEnv('Nunjucks @example', env, warned);
@@ -50,7 +54,7 @@ module.exports = env => {
               return;
             }
             exampleItem.rendered = beautify(
-              customNjkEnv.renderString(exampleItem.code),
+              stripIndent(customNjkEnv.renderString(exampleItem.code)),
               beautifyOpts
             ).trim();
           } else if (exampleItem.type === 'scss') {

diff --git a/lib/utils/getNunjucksEnv.js b/lib/utils/getNunjucksEnv.js
@@ -15,5 +15,6 @@ module.exports = (name, env, warned) => {
     }
     return null;
   }
+  nunjucks.installJinjaCompat();
   return nunjucks.configure(env.herman.nunjucks.templatepath);
 };