fix: Get rid of 'safe' filter in layout

sneas · Apr 19, 2017 · d71697a · d71697a
1 parent f913101
commit d71697a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Create you own layout file by copying minimum HTML required:
 <html>
 <head></head>
 <body>
-    {{ content | safe }}
+    {{ content }}
 </body>
 </html>
 ```

diff --git a/demo/src/layout.html b/demo/src/layout.html
@@ -3,7 +3,7 @@
 <head></head>
 <body>
     <div class="container">
-        {{ content | safe }}
+        {{ content }}
     </div>
 </body>
 </html>
diff --git a/src/assemblers/templates.js b/src/assemblers/templates.js
@@ -7,6 +7,8 @@ import nunjucks from 'nunjucks';
 import hljs from 'highlight.js';
 import cheerio from 'cheerio';
 
+let nunjucksEnv;
+
 function refineTree(item, rootDir) {
     //Remove firsts numbers and extensions
     var prettyName = item.name.replace(/^\d+\./, '').split('.').shift().replace('-', ' ');
@@ -40,17 +42,19 @@ function compileTree(item, outputDir, tree, options = {}) {
                 current: item
             });
 
-            const navigationHtml = nunjucks.render('navigation.njk', params);
-            const contentHtml = nunjucks.render('content.njk', params);
-            const layoutHtml = nunjucks.render(options.layout, {content: contentHtml});
+            const navigationHtml = nunjucksEnv.render('navigation.njk', params);
+            const contentHtml = nunjucksEnv.render('content.njk', params);
+            nunjucksEnv.opts.autoescape = false;
+            const layoutHtml = nunjucksEnv.render(options.layout, {content: contentHtml});
+            nunjucksEnv.opts.autoescape = true;
 
             const $ = cheerio.load(layoutHtml, {
                 decodeEntities: false
             });
             const head = $('head');
             const body = $('body');
 
-            head.prepend(nunjucks.render('css.njk', params));
+            head.prepend(nunjucksEnv.render('css.njk', params));
 
             if (head.find('title').length === 0) {
                 head.prepend($('<title></title>').text(options.title));
@@ -102,7 +106,7 @@ export default function(inputDir, outputDir, options = {}) {
         }
     });
 
-    (new nunjucks.configure([path.join(__dirname, 'views'), '']))
+    nunjucksEnv = (new nunjucks.configure([path.join(__dirname, 'views'), '']))
         .addFilter('template', path => fs.readFileSync(path).toString())
         .addFilter('highlight', code => hljs.highlight('htmlbars', code, true, false).value);
 

diff --git a/src/assemblers/views/layout.njk b/src/assemblers/views/layout.njk
@@ -2,6 +2,6 @@
 <html>
 <head></head>
 <body>
-    {{ content | safe }}
+    {{ content }}
 </body>
 </html>