Update build to be compatible with node 14 and fix bug in higlight co…

…de in Kotlin
Dev-Mind · Nov 5, 2020 · 5cce687 · 5cce687
1 parent dca56b4
commit 5cce687
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/extension/highlight-code.js b/extension/highlight-code.js
@@ -11,9 +11,12 @@ function extHighlightCode(_a) {
         return html
             .replace(/&amp;lt<span class="token punctuation">;<\/span>/g, '&lt;')
             .replace(/&amp;gt<span class="token punctuation">;<\/span>/g, '&gt;')
+            .replace(/&amp;quot<span class="token punctuation">;<\/span>/g, '&quot;')
+            .replace(/&amp;pos<span class="token punctuation">;<\/span>/g, '&pos;')
             .replace(/<span class=\"token operator\">&amp;<\/span>quot<span class=\"token punctuation\">;<\/span>/g, '&quot;')
             .replace(/<span class=\"token operator\">&amp;<\/span>lt<span class=\"token punctuation\">;<\/span>/g, '&lt;')
             .replace(/<span class=\"token operator\">&amp;<\/span>apos<span class=\"token punctuation\">;<\/span>/g, '&apos;')
+            .replace(/<span class=\"token operator\">&amp;<\/span>gt<span class=\"token punctuation\">;<\/span>/g, '&gt;')
             .replace(/<span class=\"token operator\">&amp;<\/span>gt<span class=\"token punctuation\">;<\/span>/g, '&gt;');
     };
     return through2.obj(function (file, _, next) {

diff --git a/extension/highlight-code.ts b/extension/highlight-code.ts
@@ -11,13 +11,16 @@ const loadLanguages = require('prismjs/components/');
 export function extHighlightCode({selector}): Transform {
 
   const updateSpecialCharacters = (html) => {
-      return html
-        .replace(/&amp;lt<span class="token punctuation">;<\/span>/g, '&lt;')
-        .replace(/&amp;gt<span class="token punctuation">;<\/span>/g, '&gt;')
-        .replace(/<span class=\"token operator\">&amp;<\/span>quot<span class=\"token punctuation\">;<\/span>/g, '&quot;')
-        .replace(/<span class=\"token operator\">&amp;<\/span>lt<span class=\"token punctuation\">;<\/span>/g, '&lt;')
-        .replace(/<span class=\"token operator\">&amp;<\/span>apos<span class=\"token punctuation\">;<\/span>/g, '&apos;')
-        .replace(/<span class=\"token operator\">&amp;<\/span>gt<span class=\"token punctuation\">;<\/span>/g, '&gt;')
+    return html
+      .replace(/&amp;lt<span class="token punctuation">;<\/span>/g, '&lt;')
+      .replace(/&amp;gt<span class="token punctuation">;<\/span>/g, '&gt;')
+      .replace(/&amp;quot<span class="token punctuation">;<\/span>/g, '&quot;')
+      .replace(/&amp;pos<span class="token punctuation">;<\/span>/g, '&pos;')
+      .replace(/<span class=\"token operator\">&amp;<\/span>quot<span class=\"token punctuation\">;<\/span>/g, '&quot;')
+      .replace(/<span class=\"token operator\">&amp;<\/span>lt<span class=\"token punctuation\">;<\/span>/g, '&lt;')
+      .replace(/<span class=\"token operator\">&amp;<\/span>apos<span class=\"token punctuation\">;<\/span>/g, '&apos;')
+      .replace(/<span class=\"token operator\">&amp;<\/span>gt<span class=\"token punctuation\">;<\/span>/g, '&gt;')
+      .replace(/<span class=\"token operator\">&amp;<\/span>gt<span class=\"token punctuation\">;<\/span>/g, '&gt;')
   };
 
   return through2.obj((file, _, next: TransformCallback) => {
@@ -26,7 +29,8 @@ export function extHighlightCode({selector}): Transform {
       lowerCaseTags: false,
       withEndIndices: false,
       normalizeWhitespace: false,
-      recognizeSelfClosing:true});
+      recognizeSelfClosing: true
+    });
 
     $(selector).each((index, code) => {
       const elem = $(code);

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "AsciiDoc"
   ],
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "author": "Guillaume EHRET <Dev-Mind>",
   "license": "MIT",

diff --git a/src/blog/2018/test2.adoc b/src/blog/2018/test2.adoc
@@ -85,3 +85,11 @@ class MainActivity : AppCompatActivity() {
     }
 }
 ----
+
+[source,kotlin,subs="specialchars"]
+----
+fun main(){
+    val name = "Dev-Mind"
+    println("Hello world $name")
+}
+----