Merge branch 'master' into pr/3264

package-lock.json

@@ -29,13 +29,13 @@
         "jwt-simple": "^0.5.6",
         "less": "^3.13.1",
         "lodash": "^4.17.21",
-        "marked": "5.1.1",
+        "marked": "11.1.1",
         "marked-extended-tables": "^1.0.8",
         "marked-gfm-heading-id": "^3.1.2",
         "marked-smartypants-lite": "^1.0.2",
         "markedLegacy": "npm:marked@^0.3.19",
         "moment": "^2.30.1",
-        "mongoose": "^8.1.0",
+        "mongoose": "^8.1.1",
         "nanoid": "3.3.4",
         "nconf": "^0.12.1",
         "react": "^18.2.0",
@@ -10041,9 +10041,9 @@
       }
     },
     "node_modules/marked": {
-      "version": "5.1.1",
+      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-11.1.1.tgz",
-      "integrity": "sha512-bTmmGdEINWmOMDjnPWDxGPQ4qkDLeYorpYbEtFOXzOruTwUE671q4Guiuchn4N8h/v6NGd7916kXsm3Iz4iUSg==",
+      "integrity": "sha512-EgxRjgK9axsQuUa/oKMx5DEY8oXpKJfk61rT5iY3aRlgU6QJtUcxU5OAymdhCvWvhYcd9FKmO5eQoX8m9VGJXg==",
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -10453,9 +10453,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.1.0",
+      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.1.tgz",
-      "integrity": "sha512-kOA4Xnq2goqNpN9EmYElGNWfxA9H80fxcr7UdJKWi3UMflza0R7wpTihCpM67dE/0MNFljoa0sjQtlXVkkySAQ==",
+      "integrity": "sha512-DbLb0NsiEXmaqLOpEz+AtAsgwhRw6f25gwa1dF5R7jj6lS1D8X6uTdhBSC8GDVtOwe5Tfw2EL7nTn6hiJT3Bgg==",
       "dependencies": {
         "bson": "^6.2.0",
         "kareem": "2.5.1",

package.json

@@ -98,13 +98,13 @@
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "5.1.1",
+    "marked": "11.1.1",
     "marked-extended-tables": "^1.0.8",
     "marked-gfm-heading-id": "^3.1.2",
     "marked-smartypants-lite": "^1.0.2",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.30.1",
-    "mongoose": "^8.1.0",
+    "mongoose": "^8.1.1",
     "nanoid": "3.3.4",
     "nconf": "^0.12.1",
     "react": "^18.2.0",

scripts/project.json

@@ -26,7 +26,6 @@
 		"codemirror/addon/edit/trailingspace.js",
 		"codemirror/addon/selection/active-line.js",
 		"moment",
-		"superagent",
+		"superagent"
-		"marked"
 	]
 }

shared/naturalcrit/markdown.js

@@ -28,6 +28,28 @@ renderer.paragraph = function(text){
 		return `<p>${text}</p>\n`;
 };
 
+//Fix local links in the Preview iFrame to link inside the frame
+renderer.link = function (href, title, text) {
+	let self = false;
+	if(href[0] == '#') {
+		self = true;
+	}
+	href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+
+	if(href === null) {
+		return text;
+	}
+	let out = `<a href="${escape(href)}"`;
+	if(title) {
+		out += ` title="${title}"`;
+	}
+	if(self) {
+		out += ' target="_self"';
+	}
+	out += `>${text}</a>`;
+	return out;
+};
+
 const mustacheSpans = {
 	name  : 'mustacheSpans',
 	level : 'inline',                                   // Is this a block-level or inline-level tokenizer?
@@ -271,28 +293,6 @@ Marked.use(mustacheInjectBlock);
 Marked.use({ renderer: renderer, mangle: false });
 Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite());
 
-//Fix local links in the Preview iFrame to link inside the frame
-renderer.link = function (href, title, text) {
-	let self = false;
-	if(href[0] == '#') {
-		self = true;
-	}
-	href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
-
-	if(href === null) {
-		return text;
-	}
-	let out = `<a href="${escape(href)}"`;
-	if(title) {
-		out += ` title="${title}"`;
-	}
-	if(self) {
-		out += ' target="_self"';
-	}
-	out += `>${text}</a>`;
-	return out;
-};
-
 const nonWordAndColonTest = /[^\w:]/g;
 const cleanUrl = function (sanitize, base, href) {
 	if(sanitize) {