Replace Markdown renderer

Author: rcarmo

README.md

@@ -32,6 +32,7 @@ This sample currently assumes you've performed the following provisioning action
 - [ ] Azure Template for automated deployment
 - [ ] List of blog posts (ordered list of everything under `/blog`)
 - [ ] Add auxiliary storage table for metadata lookup
+- [ ] Set blob metadata from page frontmatter
 - [ ] Flesh out example content and formatting tests
 - [x] Reformat asset links (images, stylesheets, etc.)
 - [x] Split blob storage access from rendering (`renderTemplateActivity`)

copyActivity/index.js

@@ -3,11 +3,7 @@
  * triggered by an orchestrator function.
  */
 
-const fs = require("fs"),
-      path = require("path"),
-      storage = require("azure-storage"),
-      marked = require('marked'),
-      mime = require('mime-types'),
+const storage = require("azure-storage"),
       blobService = storage.createBlobService(process.env['AzureWebJobsStorage']);
 
 
@@ -24,7 +20,7 @@ const copyBlob = async (srcUri, pathname) => {
 }
 
 module.exports = async function (context, name) {
-    context.log("copy:", name);
+    //context.log("copy:", name);
     const srcUri = blobService.getUrl('raw-markup', name),
         result = await copyBlob(srcUri, name);
 

package.json

@@ -7,7 +7,7 @@
     "durable-functions": "^1.2.2",
     "cheerio": "^1.0.0-rc.3",
     "gray-matter": "^4.0.2",
-    "marked": "^0.7.0",
+    "remarkable": "^2.0.0",
     "moment": "^2.24.0",
     "mustache": "^3.0.1",
     "textile-js": "^2.0.4",

renderMarkdownActivity/index.js

@@ -5,19 +5,26 @@
 
 const storage = require("azure-storage"),
       matter = require("gray-matter"),
-      marked = require('marked'),
+      remarkable = require('remarkable'),
+      hljs = require('highlight.js'),
       blobService = storage.createBlobService(process.env['AzureWebJobsStorage']);
 
-marked.setOptions({
-  renderer: new marked.Renderer(),
-  highlight: function(code) {
-    return require('highlight.js').highlightAuto(code).value;
-  },
-  gfm: true,
-  breaks: false,
-  smartLists: true,
-  smartypants: true,
-  xhtml: false
+var md = new remarkable.Remarkable({
+    highlight: function (str, lang) {
+      if (lang && hljs.getLanguage(lang)) {
+        try {
+          return hljs.highlight(lang, str).value;
+        } catch (err) {}
+      }
+  
+      try {
+        return hljs.highlightAuto(str).value;
+      } catch (err) {}
+  
+      return ''; // use external default escaping
+    },
+    typographer: true,
+    html: true
 });
 
 const getMarkup = async (blobName) => {
@@ -33,11 +40,11 @@ const getMarkup = async (blobName) => {
 };
 
 module.exports = async function (context, name) {
-    context.log(name);
+    //context.log(name);
     const response = await getMarkup(name),
             page = matter(response);
     page.name = name;
     // replace Markdown with rendered HTML
-    page.content = marked(page.content);
+    page.content = md.render(page.content);
     return page;
 };

renderPipeline/index.js

@@ -14,10 +14,12 @@ const df = require('durable-functions'),
                 extensions: ['.text', '.textile'],
                 pipeline: ['renderTextileActivity', 'renderTemplateActivity']
             },
+           /* Render HTML snippets directly (disabled to allow custom content pass-through)
             renderTemplateActivity: {
                 extensions: ['.htm', '.html'],
                 pipeline: ['renderTemplateActivity']
             }
+            */
         };
 
 module.exports = df.orchestrator(function* (context) {
@@ -40,7 +42,7 @@ module.exports = df.orchestrator(function* (context) {
     for(let activity of pipeline) {
         // context.log("running:", activity);
         currentItem = yield context.df.callActivity(activity, currentItem);
-        context.log(currentItem);
+        //context.log(currentItem);
         if(currentItem == null) { // the activity has failed
             context.log("error:", activity)
             yield cancel(activity)

renderTemplateActivity/index.js

@@ -45,7 +45,7 @@ Object.fromEntries = arr => Object.assign({}, ...Array.from(arr, ([k, v]) => ({[
 
 
 module.exports = async function (context, page) {
-    context.log(page.name);
+    // context.log(page.name);
 
     const template = await getTemplate('_assets/page_template.html');
 
@@ -96,7 +96,7 @@ module.exports = async function (context, page) {
 
     const result = await uploadHTML(page.name.substr(0, page.name.lastIndexOf(".")) + ".html", html);
 
-    context.log(html);
-    context.log(result);
+    // context.log(html);
+    // context.log(result);
     return result;
 };

renderTextileActivity/index.js

@@ -21,11 +21,13 @@ const getMarkup = async (blobName) => {
 };
 
 module.exports = async function (context, name) {
-    context.log(name);
+    // context.log(name);
+
     const response = await getMarkup(name),
             page = matter(response);
     page.name = name;
-    // replace Markdown with rendered HTML
+
+    // replace Textile with rendered HTML
     page.content = textile(page.content);
     return page;
 };

sampleContent/404.md

@@ -1,5 +1,3 @@
 ---
 Title: Page Not Found
----
-
-Page not found.
+---