nodebb-plugin-markdown 13.2.4 → 13.2.5

package/index.js

@@ -4,13 +4,13 @@ const MarkdownIt = require('markdown-it');
 const fs = require('fs');
 const path = require('path');
 
-const nconf = require.main.require('nconf');
-const winston = require.main.require('winston');
-const meta = require.main.require('./src/meta');
-const activitypub = require.main.require('./src/activitypub');
-const plugins = require.main.require('./src/plugins');
+const nconf = nodebb.require('nconf');
+const winston = nodebb.require('winston');
+const meta = nodebb.require('./src/meta');
+const activitypub = nodebb.require('./src/activitypub');
+const plugins = nodebb.require('./src/plugins');
 
-const SocketPlugins = require.main.require('./src/socket.io/plugins');
+const SocketPlugins = nodebb.require('./src/socket.io/plugins');
 SocketPlugins.markdown = require('./websockets');
 
 let parser;
@@ -21,8 +21,8 @@ const Markdown = {
 		app = params.app;
 		const { router } = params;
 		const controllers = require('./lib/controllers');
-		const hostMiddleware = require.main.require('./src/middleware');
-		const routeHelpers = require.main.require('./src/routes/helpers');
+		const hostMiddleware = nodebb.require('./src/middleware');
+		const routeHelpers = nodebb.require('./src/routes/helpers');
 		const middlewares = [
 			hostMiddleware.maintenanceMode, hostMiddleware.registrationComplete, hostMiddleware.pluginHooks,
 		];

package/lib/controllers.js

@@ -3,12 +3,16 @@
 const path = require('path');
 
 const parent = module.parent.exports;
-const posts = require.main.require('./src/posts');
-const file = require.main.require('./src/file');
-const Controllers = {};
+const posts = nodebb.require('./src/posts');
+const file = nodebb.require('./src/file');
+const { paths } = nodebb.require('./src/constants');
+
+const Controllers = module.exports;
 
 Controllers.renderAdmin = async function renderAdmin(req, res) {
-	let hljsLanguages = await file.walk(path.resolve(require.main.path, 'node_modules/highlight.js/lib/languages'));
+	let hljsLanguages = await file.walk(
+		path.resolve(paths.nodeModules, 'highlight.js/lib/languages')
+	);
 	hljsLanguages = hljsLanguages.map(language => path.basename(language, '.js')).filter(language => !language.endsWith('.js'));
 
 	res.render('admin/plugins/markdown', {
@@ -36,5 +40,3 @@ Controllers.retrieveRaw = function retrieveRaw(req, res, next) {
 		});
 	});
 };
-
-module.exports = Controllers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "13.2.4",
+  "version": "13.2.5",
   "description": "A Markdown parser for NodeBB",
   "main": "index.js",
   "repository": {
@@ -39,14 +39,13 @@
     "markdown-it-multimd-table": "^4.0.1"
   },
   "nbbpm": {
-    "compatibility": "^4.1.0"
+    "compatibility": "^4.12.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-angular": "16.2.1",
-    "eslint": "^9.25.1",
-    "eslint-config-nodebb": "^1.1.4",
-    "eslint-plugin-import": "^2.31.0",
+    "@eslint/js": "^10.0.1",
+    "eslint-config-nodebb": "^2.0.2",
     "husky": "7.0.4",
     "lint-staged": "12.3.5"
   }

package/public/js/admin.js

@@ -1,7 +1,7 @@
 'use strict';
 
 define('admin/plugins/markdown', ['settings'], function (Settings) {
-	var Markdown = {};
+	const Markdown = {};
 
 	Markdown.init = function () {
 		Settings.load('markdown', $('.markdown-settings'), function (err, settings) {
@@ -9,7 +9,7 @@ define('admin/plugins/markdown', ['settings'], function (Settings) {
 				settings = {};
 			}
 
-			var defaults = {
+			const defaults = {
 				html: false,
 
 				langPrefix: 'language-',

package/public/js/client.js

@@ -38,7 +38,7 @@
 		}
 
 		$(window).on('action:composer.enhanced', function (evt, data) {
-			var textareaEl = data.postContainer.find('textarea');
+			const textareaEl = data.postContainer.find('textarea');
 			markdown.capturePaste(textareaEl);
 			markdown.prepareFormattingTools();
 		});

package/public/js/markdown.js

@@ -2,11 +2,11 @@
 
 export function capturePaste(targetEl) {
 	targetEl.on('paste', function (e) {
-		var triggers = [/^>\s*/, /^\s*\*\s+/, /^\s*\d+\.\s+/, /^\s{4,}/];
-		var start = e.target.selectionStart;
-		var line = getLine(targetEl.val(), start);
+		const triggers = [/^>\s*/, /^\s*\*\s+/, /^\s*\d+\.\s+/, /^\s{4,}/];
+		const start = e.target.selectionStart;
+		const line = getLine(targetEl.val(), start);
 
-		var trigger = triggers.reduce(function (regexp, cur) {
+		const trigger = triggers.reduce(function (regexp, cur) {
 			if (regexp) {
 				return regexp;
 			}
@@ -14,15 +14,15 @@ export function capturePaste(targetEl) {
 			return cur.test(line) ? cur : false;
 		}, false);
 
-		var prefix = line.match(trigger);
+		let prefix = line.match(trigger);
 		if (prefix) {
 			prefix = prefix.shift();
 
-			var payload = e.originalEvent.clipboardData.getData('text');
-			var fixed = payload.replace(/^/gm, prefix).slice(prefix.length);
+			const payload = e.originalEvent.clipboardData.getData('text');
+			const fixed = payload.replace(/^/gm, prefix).slice(prefix.length);
 
 			setTimeout(function () {
-				var replacement = targetEl.val().slice(0, start) + fixed + targetEl.val().slice(start + payload.length);
+				const replacement = targetEl.val().slice(0, start) + fixed + targetEl.val().slice(start + payload.length);
 				targetEl.val(replacement);
 			}, 0);
 		}
@@ -30,7 +30,7 @@ export function capturePaste(targetEl) {
 
 	function getLine(text, selectionStart) {
 		// Break apart into lines, return the line the cursor is in
-		var lines = text.split('\n');
+		const lines = text.split('\n');
 
 		return lines.reduce(function (memo, cur) {
 			if (typeof memo !== 'number') {
@@ -77,7 +77,7 @@ export function prepareFormattingTools() {
 
 				formatting.addButtonDispatch('bold', function (textarea, selectionStart, selectionEnd) {
 					if (selectionStart === selectionEnd) {
-						var block = controls.getBlockData(textarea, '**', selectionStart);
+						const block = controls.getBlockData(textarea, '**', selectionStart);
 
 						if (block.in && block.atEnd) {
 							// At end of bolded string, move cursor past delimiters
@@ -89,7 +89,7 @@ export function prepareFormattingTools() {
 							);
 						}
 					} else {
-						var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '**');
+						const wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '**');
 						controls.updateTextareaSelection(
 							textarea, selectionStart + 2 + wrapDelta[0], selectionEnd + 2 - wrapDelta[1]
 						);
@@ -98,7 +98,7 @@ export function prepareFormattingTools() {
 
 				formatting.addButtonDispatch('italic', function (textarea, selectionStart, selectionEnd) {
 					if (selectionStart === selectionEnd) {
-						var block = controls.getBlockData(textarea, '*', selectionStart);
+						const block = controls.getBlockData(textarea, '*', selectionStart);
 
 						if (block.in && block.atEnd) {
 							// At end of italicised string, move cursor past delimiters
@@ -110,7 +110,7 @@ export function prepareFormattingTools() {
 							);
 						}
 					} else {
-						var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '*');
+						const wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '*');
 						controls.updateTextareaSelection(
 							textarea, selectionStart + 1 + wrapDelta[0], selectionEnd + 1 - wrapDelta[1]
 						);
@@ -143,7 +143,7 @@ export function prepareFormattingTools() {
 
 				formatting.addButtonDispatch('strikethrough', function (textarea, selectionStart, selectionEnd) {
 					if (selectionStart === selectionEnd) {
-						var block = controls.getBlockData(textarea, '~~', selectionStart);
+						const block = controls.getBlockData(textarea, '~~', selectionStart);
 
 						if (block.in && block.atEnd) {
 							// At end of bolded string, move cursor past delimiters
@@ -155,7 +155,7 @@ export function prepareFormattingTools() {
 							);
 						}
 					} else {
-						var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '~~', '~~');
+						const wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '~~', '~~');
 						controls.updateTextareaSelection(
 							textarea, selectionStart + 2 + wrapDelta[0], selectionEnd + 2 - wrapDelta[1]
 						);
@@ -169,7 +169,7 @@ export function prepareFormattingTools() {
 							textarea, selectionStart + 4, selectionEnd + strings['code-text'].length + 4
 						);
 					} else {
-						var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '```\n', '\n```');
+						const wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '```\n', '\n```');
 						controls.updateTextareaSelection(
 							textarea, selectionStart + 4 + wrapDelta[0], selectionEnd + 4 - wrapDelta[1]
 						);
@@ -185,7 +185,7 @@ export function prepareFormattingTools() {
 							selectionEnd + strings['link-text'].length + strings['link-url'].length + 3
 						);
 					} else {
-						var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '[', '](' + strings['link-url'] + ')');
+						const wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '[', '](' + strings['link-url'] + ')');
 						controls.updateTextareaSelection(
 							textarea, selectionEnd + 3 - wrapDelta[1], selectionEnd + strings['link-url'].length + 3 - wrapDelta[1]
 						);
@@ -201,7 +201,7 @@ export function prepareFormattingTools() {
 							selectionEnd + strings['picture-text'].length + strings['picture-url'].length + 4
 						);
 					} else {
-						var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '![', '](' + strings['picture-url'] + ')');
+						const wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '![', '](' + strings['picture-url'] + ')');
 						controls.updateTextareaSelection(
 							textarea, selectionEnd + 4 - wrapDelta[1], selectionEnd + strings['picture-url'].length + 4 - wrapDelta[1]
 						);
@@ -248,8 +248,8 @@ export function enhanceCheckbox(ev, data) {
 		data.posts = [data.post];
 	}
 
-	var disable;
-	var checkboxEls;
+	let disable;
+	let checkboxEls;
 	data.posts.forEach(function (post) {
 		disable = !post.display_edit_tools;
 		checkboxEls = $('.posts li[data-pid="' + post.pid + '"] .content div.plugin-markdown input[type="checkbox"]');
@@ -261,9 +261,9 @@ export function enhanceCheckbox(ev, data) {
 			}
 
 			// Otherwise, edit the post to reflect state change
-			var _this = this;
-			var pid = $(this).parents('li[data-pid]').attr('data-pid');
-			var index = $(this).parents('.content').find('input[type="checkbox"]').toArray()
+			const _this = this;
+			const pid = $(this).parents('li[data-pid]').attr('data-pid');
+			const index = $(this).parents('.content').find('input[type="checkbox"]').toArray()
 				.reduce(function (memo, cur, index) {
 					if (cur === _this) {
 						memo = index;

package/upgrades/reset_md_hljs_theme.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const meta = require.main.require('./src/meta');
+const meta = nodebb.require('./src/meta');
 const markdown = require('..');
 
 module.exports = {

package/upgrades/use_unminified_hljs_theme.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const meta = require.main.require('./src/meta');
+const meta = nodebb.require('./src/meta');
 
 module.exports = {
 	name: 'Update Markdown Theme to point to unminified file',

package/websockets.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const privileges = require.main.require('./src/privileges');
-const postsAPI = require.main.require('./src/api/posts');
-const posts = require.main.require('./src/posts');
+const privileges = nodebb.require('./src/privileges');
+const postsAPI = nodebb.require('./src/api/posts');
+const posts = nodebb.require('./src/posts');
 
 module.exports.checkbox = {
 	edit: async function (socket, data) {