Merge pull request #2856 from naturalcrit/dependabot/npm_and_yarn/marked-5.0.4

Bump marked from 4.3.0 to 5.0.4

package-lock.json

@@ -29,8 +29,10 @@
         "jwt-simple": "^0.5.6",
         "less": "^3.13.1",
         "lodash": "^4.17.21",
-        "marked": "4.3.0",
+        "marked": "5.0.4",
         "marked-extended-tables": "^1.0.6",
+        "marked-gfm-heading-id": "^3.0.3",
+        "marked-smartypants": "^1.0.2",
         "markedLegacy": "npm:marked@^0.3.19",
         "moment": "^2.29.4",
         "mongoose": "^7.2.2",
@@ -6413,6 +6415,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/github-slugger": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz",
+      "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -9648,14 +9655,14 @@
       }
     },
     "node_modules/marked": {
-      "version": "4.3.0",
+      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-5.0.4.tgz",
-      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "integrity": "sha512-r0W8/DK56fAkV0qfUCO9cEt/VlFWUzoJOqEigvijmsVkTuPOHckh7ZutNJepRO1AxHhK96/9txonHg4bWd/aLA==",
       "bin": {
         "marked": "bin/marked.js"
       },
       "engines": {
-        "node": ">= 12"
+        "node": ">= 18"
       }
     },
     "node_modules/marked-extended-tables": {
@@ -9666,6 +9673,28 @@
         "marked": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/marked-gfm-heading-id": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/marked-gfm-heading-id/-/marked-gfm-heading-id-3.0.3.tgz",
+      "integrity": "sha512-ouAOxtHYa34yFocjCk5xIIcEjg40YXNdpkfLqH6TGbkmXPMPxApWXLdOi0Z1AXUweMQC9bWt2e8MGrIYB2f6+w==",
+      "dependencies": {
+        "github-slugger": "^2.0.0"
+      },
+      "peerDependencies": {
+        "marked": "^4 || ^5"
+      }
+    },
+    "node_modules/marked-smartypants": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/marked-smartypants/-/marked-smartypants-1.0.2.tgz",
+      "integrity": "sha512-hpbM9waiBSIHpqdoU5AAeuYozeObBwUet3xkCFrFBA+1329byRVxLDwYmelMCS3ss+sEVJhDgrunIy+ubiqFwQ==",
+      "dependencies": {
+        "smartypants": "^0.1.6"
+      },
+      "peerDependencies": {
+        "marked": "^4 || ^5"
+      }
+    },
     "node_modules/markedLegacy": {
       "name": "marked",
       "version": "0.3.19",
@@ -15304,6 +15333,15 @@
         "npm": ">= 3.0.0"
       }
     },
+    "node_modules/smartypants": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/smartypants/-/smartypants-0.1.6.tgz",
+      "integrity": "sha512-zGXh+Q6Y3OPTLM5x2HxAIkEAj4ZcePftmIOdIYozv2T+m03Sp5R4YppczKuo6IdnSMc99U+Wgvy8Mil0eeep7g==",
+      "bin": {
+        "smartypants": "bin/smartypants.js",
+        "smartypantsu": "bin/smartypantsu.js"
+      }
+    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",

package.json

@@ -97,8 +97,10 @@
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "4.3.0",
+    "marked": "5.0.4",
     "marked-extended-tables": "^1.0.6",
+    "marked-gfm-heading-id": "^3.0.3",
+    "marked-smartypants": "^1.0.2",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.29.4",
     "mongoose": "^7.2.2",

shared/naturalcrit/markdown.js

@@ -2,6 +2,8 @@
 const _ = require('lodash');
 const Marked = require('marked');
 const MarkedExtendedTables = require('marked-extended-tables');
+const {gfmHeadingId: MarkedGFMHeadingId} = require('marked-gfm-heading-id');
+const {markedSmartypants: MarkedSmartyPants} = require('marked-smartypants');
 const renderer = new Marked.Renderer();
 
 //Processes the markdown within an HTML block if it's just a class-wrapper
@@ -237,9 +239,9 @@ const definitionLists = {
 };
 
 Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists] });
-Marked.use(MarkedExtendedTables());
 Marked.use(mustacheInjectBlock);
-Marked.use({ renderer: renderer, smartypants: true });
+Marked.use({ renderer: renderer, smartypants: true, mangle: false, smartypants: false });
+Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartyPants());
 
 //Fix local links in the Preview iFrame to link inside the frame
 renderer.link = function (href, title, text) {