Merge branch 'release/v1.7.1'

joeworkman · joeworkman · commit 18891d3a3963 · 2020-07-23T15:23:55.000-07:00
diff --git a/helpers/code.js b/helpers/code.js
@@ -11,6 +11,7 @@ var hljs = require('highlight.js');
  */
 module.exports = function(language, options) {
   if (typeof language === 'undefined') language = 'html';
+  language = hljs.getLanguage(language) ? language : 'html';
 
   var code = hljs.highlight(language, options.fn(this)).value;
 
diff --git a/helpers/markdown.js b/helpers/markdown.js
@@ -15,6 +15,8 @@ var marked = require('marked');
    renderer.code = function(code, language) {
      if (typeof language === 'undefined') language = 'html';
 
+     language = hljs.getLanguage(language) ? language : 'html';
+
      var renderedCode = hljs.highlight(language, code).value;
      var output = `<div class="code-example"><pre><code class="${language} hljs">${renderedCode}</code></pre></div>`;
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "panini",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "A super tiny flat file compiler.",
   "main": "index.js",
   "scripts": {
diff --git a/test/fixtures/helper-markdown/build/index.html b/test/fixtures/helper-markdown/build/index.html
@@ -2,6 +2,6 @@
   <body>
     <h1 id="heading">Heading</h1>
     <p>Paragraph</p>
-    
+    <div class="code-example"><pre><code class="html hljs">my code block should default to html</code></pre></div><div class="code-example"><pre><code class="css hljs"><span class="hljs-class">.class</span><span class="hljs-rules">{<span class="hljs-rule"><span class="hljs-attribute">color</span>:<span class="hljs-value">red</span></span></span>}</code></pre></div>
   </body>
 </html>
diff --git a/test/fixtures/helper-markdown/expected/index.html b/test/fixtures/helper-markdown/expected/index.html
@@ -2,6 +2,6 @@
   <body>
     <h1 id="heading">Heading</h1>
     <p>Paragraph</p>
-    
+    <div class="code-example"><pre><code class="html hljs">my code block should default to html</code></pre></div><div class="code-example"><pre><code class="css hljs"><span class="hljs-class">.class</span><span class="hljs-rules">{<span class="hljs-rule"><span class="hljs-attribute">color</span>:<span class="hljs-value">red</span></span></span>}</code></pre></div>
   </body>
 </html>
diff --git a/test/fixtures/helper-markdown/pages/index.html b/test/fixtures/helper-markdown/pages/index.html
@@ -2,4 +2,12 @@
 # Heading
 
 Paragraph
+
+```
+my code block should default to html
+```
+
+```css
+.class{color:red}
+```
 {{/markdown}}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "panini",`
`3`		`- "version": "1.7.0",`
	`3`	`+ "version": "1.7.1",`
`4`	`4`	`"description": "A super tiny flat file compiler.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`