site: tidy code highlighting

site/src/routes/api/blog/_posts.js

@@ -3,9 +3,8 @@ import path from 'path';
 import process_markdown from '../../../utils/_process_markdown.js';
 import marked from 'marked';
 
-// import hljs from 'highlight.js';
+import PrismJS from 'prismjs';
-import prismjs from 'prismjs'; // prism-highlighter – smaller footprint [hljs: 192.5k]
+import 'prismjs/components/prism-bash';
-require('prismjs/components/prism-bash');
 
 // map lang to prism-language-attr
 const prismLang = {
@@ -31,10 +30,10 @@ export default function() {
 			const renderer = new marked.Renderer();
 
 			renderer.code = (source, lang) => {
-        let plang = prismLang[lang];
+				const plang = prismLang[lang];
-        const highlighted = Prism.highlight(
+				const highlighted = PrismJS.highlight(
 					source,
-          Prism.languages[plang],
+					PrismJS.languages[plang],
 					lang,
 				);
 
@@ -43,9 +42,7 @@ export default function() {
 
 			const html = marked(
 				content.replace(/^\t+/gm, match => match.split('\t').join('  ')),
-        {
+				{ renderer }
-          renderer,
-        },
 			);
 
 			return {
@@ -54,7 +51,5 @@ export default function() {
 				slug: file.replace(/^[\d-]+/, '').replace(/\.md$/, ''),
 			};
 		})
-    .sort((a, b) => {
+		.sort((a, b) => a.metadata.pubdate < b.metadata.pubdate ? 1 : -1);
-      return a.metadata.pubdate < b.metadata.pubdate ? 1 : -1;
-    });
 }

site/src/routes/guide/_sections.js

@@ -4,13 +4,8 @@ import * as fleece from 'golden-fleece';
 import process_markdown from '../../utils/_process_markdown.js';
 import marked from 'marked';
 
-import Prism from 'prismjs'; // prism-highlighter – smaller footprint [hljs: 192.5k]
+import PrismJS from 'prismjs';
-require('prismjs/components/prism-bash');
+import 'prismjs/components/prism-bash';
-
-const langs = {
-	'hidden-data': 'json',
-	'html-no-repl': 'html',
-};
 
 // map lang to prism-language-attr
 const prismLang = {
@@ -20,10 +15,6 @@ const prismLang = {
 	css: 'css',
 };
 
-function btoa(str) {
-	return new Buffer(str).toString('base64');
-}
-
 const escaped = {
 	'"': '"',
 	"'": ''',
@@ -112,13 +103,6 @@ export default function() {
 				let className = 'code-block';
 
 				if (lang === 'html' && !group) {
-					/* prettier-ignore
-					-----------------------------------------------
-						edit vedam
-						don't know how to access components here
-						so i hardcoded icon here
-					-----------------------------------------------
-					*/
 					if (!meta || meta.repl !== false) {
 						prefix = `<a class='open-in-repl' href='repl?demo=@@${uid}' title='open in REPL'><svg class='icon'><use xlink:href='#maximize-2' /></svg></a>`;
 					}
@@ -140,16 +124,10 @@ export default function() {
 
 				if (meta && meta.hidden) return '';
 
-				/* prettier-ignore
+				const plang = prismLang[lang];
-				-----------------------------------------------
+				const highlighted = PrismJS.highlight(
-				design-edit vedam
-				insert prism-highlighter
-				-----------------------------------------------
-				*/
-				let plang = prismLang[lang];
-				const highlighted = Prism.highlight(
 					source,
-					Prism.languages[plang],
+					PrismJS.languages[plang],
 					lang
 				);