nodebb-plugin-markdown 12.2.1 → 12.2.3

package/index.js

@@ -200,7 +200,7 @@ const Markdown = {
 			while ((current = matcher.exec(data.postData.content)) !== null) {
 				const match = current[1];
 				if (match && Markdown.isExternalLink(match)) { // for security only parse external images
-					const parsedUrl = new URL(match);
+					const parsedUrl = new URL(match, nconf.get('url'));
 					const filename = path.basename(parsedUrl.pathname);
 					const size = Markdown._externalImageCache.get(match);
 
@@ -432,7 +432,7 @@ const Markdown = {
 		const allowed = pathname => allowedRoots.some(root => pathname.toString().startsWith(root) || pathname.toString().startsWith(nconf.get('relative_path') + root));
 
 		try {
-			const urlObj = new URL(src);
+			const urlObj = new URL(src, nconf.get('url'));
 			return !(urlObj.host === null && !allowed(urlObj.pathname));
 		} catch (e) {
 			return false;
@@ -443,11 +443,7 @@ const Markdown = {
 		let urlObj;
 		let baseUrlObj;
 		try {
-			if (urlString.startsWith('//')) {
-				urlString = `${nconf.get('url_parsed').protocol}${urlString}`;
-			}
-
-			urlObj = new URL(urlString);
+			urlObj = new URL(urlString, nconf.get('url'));
 			baseUrlObj = nconf.get('url_parsed');
 		} catch (err) {
 			return false;

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "12.2.1",
+  "version": "12.2.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nodebb-plugin-markdown",
-      "version": "12.2.1",
+      "version": "12.2.3",
       "license": "MIT",
       "dependencies": {
         "highlight.js": "11.4.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "12.2.1",
+  "version": "12.2.3",
   "description": "A Markdown parser for NodeBB",
   "main": "index.js",
   "repository": {

package/public/js/client.js

@@ -2,6 +2,41 @@
 
 (function () {
 	require(['markdown', 'components'], (markdown, components) => {
+		async function initHljs() {
+			if (window.hljs) {
+				return;
+			}
+			console.debug('[plugin/markdown] Initializing highlight.js');
+			let hljs;
+			let list;
+			if (config.markdown.hljsLanguages.includes('common')) {
+				({ default: hljs} = await import(`highlight.js/lib/common`));
+				list = 'common';
+			} else if (config.markdown.hljsLanguages.includes('all')) {
+				({ default: hljs} = await import(`highlight.js`));
+				list = 'all';
+			} else {
+				({ default: hljs} = await import(`highlight.js/lib/core`));
+				list = 'core';
+			}
+
+			console.debug(`[plugins/markdown] Loaded ${list} hljs library`);
+
+			if (list !== 'all') {
+				await Promise.all(config.markdown.hljsLanguages.map(async (language) => {
+					if (['common', 'all'].includes(language)) {
+						return;
+					}
+
+					console.debug(`[plugins/markdown] Loading ${language} support`);
+					const { default: lang } = await import('../../node_modules/highlight.js/lib/languages/' + language + '.js');
+					hljs.registerLanguage(language, lang);
+				}));
+			}
+			window.hljs = hljs;
+			markdown.buildAliasMap();
+		}
+
 		$(window).on('action:composer.enhanced', function (evt, data) {
 			var textareaEl = data.postContainer.find('textarea');
 			markdown.capturePaste(textareaEl);
@@ -10,9 +45,13 @@
 
 		$(window).on('action:composer.preview', {
 			selector: '.composer .preview pre code',
-		}, markdown.highlight);
+		}, async (params) => {
+			await initHljs();
+			markdown.highlight(params)
+		});
 
-		$(window).on('action:posts.loaded action:topic.loaded action:posts.edited', function (ev, data) {
+		$(window).on('action:posts.loaded action:topic.loaded action:posts.edited', async function (ev, data) {
+			await initHljs();
 			markdown.highlight(components.get('post/content').find('pre code'));
 			markdown.enhanceCheckbox(ev, data);
 			markdown.markExternalLinks();

package/public/js/markdown.js

@@ -251,45 +251,11 @@ export function highlight(data) {
 	}
 };
 
-async function processHighlight(elements) {
-	if (parseInt(config.markdown.highlight, 10)) {
-		console.debug('[plugin/markdown] Initializing highlight.js');
-		let hljs;
-		let list;
-		let aliasMap = new Map();
-		switch(true) {
-			case config.markdown.hljsLanguages.includes('common'): {
-				({ default: hljs} = await import(`highlight.js/lib/common`));
-				list = 'common';
-				break;
-			}
-
-			case config.markdown.hljsLanguages.includes('all'): {
-				({ default: hljs} = await import(`highlight.js`));
-				list = 'all';
-				break;
-			}
-
-			default: {
-				({ default: hljs} = await import(`highlight.js/lib/core`));
-				list = 'core';
-			}
-		}
-		console.debug(`[plugins/markdown] Loaded ${list} hljs library`);
-
-		if (list !== 'all') {
-			await Promise.all(config.markdown.hljsLanguages.map(async (language) => {
-				if (['common', 'all'].includes(language)) {
-					return;
-				}
+const aliasMap = new Map();
 
-				console.debug(`[plugins/markdown] Loading ${language} support`);
-				const { default: lang } = await import('../../node_modules/highlight.js/lib/languages/' + language + '.js');
-				hljs.registerLanguage(language, lang);
-			}));
-		}
-
-		// Build alias set
+export function buildAliasMap() {
+	if (window.hljs) {
+		const hljs = window.hljs;
 		hljs.listLanguages().forEach((language) => {
 			const { aliases } = hljs.getLanguage(language);
 			if (aliases && Array.isArray(aliases)) {
@@ -300,9 +266,19 @@ async function processHighlight(elements) {
 
 			aliasMap.set(language, language);
 		});
+	}
+}
+
+async function processHighlight(elements) {
+	if (parseInt(config.markdown.highlight, 10)) {
+		const hljs = window.hljs;
+		if (!hljs) {
+			console.debug(`[plugins/markdown] Tryin to highlight without initializing hljs`);
+			return;
+		}
 
 		console.debug(`[plugins/markdown] Loading support for line numbers`);
-		window.hljs = hljs;
+
 		require('highlightjs-line-numbers.js');
 
 		elements.each(function (i, block) {
@@ -321,7 +297,7 @@ async function processHighlight(elements) {
 
 			// Check detected language against whitelist and add lines if enabled
 			const classIterator = block.classList.values();
-			for(className of classIterator) {
+			for (const className of classIterator) {
 				if (className.startsWith('language-')) {
 					const language = className.split('-')[1];
 					const list = config.markdown.highlightLinesLanguageList;