Merge branch 'main' into develop

fumiX · Jun 16, 2023 · 3b0a72b · 3b0a72b
2 parents 2473ae6 + e66a7ce
commit 3b0a72b
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 17 deletions.
diff --git a/common/package.json b/common/package.json
@@ -11,17 +11,19 @@
   },
   "dependencies": {
     "dompurify": "^3.0.1",
-    "highlight.js": "^11.7.0",
+    "highlight.js": "^11.8.0",
     "jsdom": "^22.0.0",
     "marked": "^5.0.2",
+    "marked-highlight": "^2.0.1",
+    "marked-mangle": "^1.0.1",
     "node-fetch": "^3.3.1",
     "pako": "2.1.0",
     "sha.js": "^2.4.11"
   },
   "devDependencies": {
     "@types/dompurify": "^3.0.0",
     "@types/jsdom": "^21.1.0",
-    "@types/marked": "^4.0.7",
+    "@types/marked": "^5.0.0",
     "@types/node": "^18.16.10",
     "@types/node-fetch": "^2.6.2",
     "@types/pako": "^2.0.0",

diff --git a/common/src/markdown-converter-common.ts b/common/src/markdown-converter-common.ts
@@ -3,6 +3,8 @@ import { Buffer } from "buffer";
 import { DOMPurifyI } from "dompurify";
 import highlightjs from "highlight.js";
 import { marked } from "marked";
+import { markedHighlight } from "marked-highlight";
+import { mangle } from "marked-mangle";
 import pako from "pako";
 
 /**
@@ -84,8 +86,6 @@ export abstract class MarkdownConverter {
               const res = Buffer.from(compressed).toString("base64").replace(/\+/g, "-").replace(/\//g, "_");
               token.text = await fetchTextFromUrl(`${MarkdownConverter.KROKI_SERVICE_URL}/${diagramType.id}/svg/${res}`);
             }
-          } else if (token.type === "image") {
-            token.href = "";
           }
         },
       };
@@ -108,6 +108,15 @@ export abstract class MarkdownConverter {
       },
     });
     marked.use(MarkdownConverter.rendererExtension);
+    marked.use(
+      markedHighlight({
+        highlight: function (code: string, lang: string) {
+          return highlightjs.highlightAuto(code).value;
+        },
+      }),
+    );
+    marked.use(mangle());
+    marked.use({ headerIds: false });
   }
 
   private f: ImageHashToUrlFunction | undefined;
@@ -116,11 +125,8 @@ export abstract class MarkdownConverter {
     this.f = imgHashToUrl;
     return marked
       .parse(input, {
-        highlight: function (code, lang) {
-          return highlightjs.highlightAuto(code).value;
-        },
         async: true,
-      }) //
+      })
       .then((parsedInput) =>
         this.dompurify.sanitize(parsedInput, {
           // Allowed tags and attributes inside markdown

diff --git a/common/src/types/markedhighlight.d.ts b/common/src/types/markedhighlight.d.ts
@@ -0,0 +1 @@
+declare module "marked-highlight";
diff --git a/common/src/types/markedmangle.d.ts b/common/src/types/markedmangle.d.ts
@@ -0,0 +1 @@
+declare module "marked-mangle";
diff --git a/common/tsconfig.json b/common/tsconfig.json
@@ -26,9 +26,12 @@
     "baseUrl": ".",
     "paths": {
       "@common/*": ["./src/*"]
-    }
+    },
   },
   "include": [
     "./src/**/*.ts",
-  ]
+  ],
+  "ts-node": {
+    "files": true
+  }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -34,7 +34,7 @@
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.14",
     "@types/jsdom": "^21.1.0",
-    "@types/marked": "^4.0.7",
+    "@types/marked": "^5.0.0",
     "@types/multer": "^1.4.7",
     "@types/node": "^18.16.10",
     "@types/node-fetch": "^2.6.2",