nodebb-plugin-markdown 9.0.8 → 10.0.0

package/.eslintrc

@@ -1,128 +1,3 @@
 {
-	"extends": "airbnb-base",
-	"parserOptions": {
-		"sourceType": "script"
-	},
-
-	"rules": {
-		// Customized
-		"handle-callback-err": [ "error","^(e$|(e|(.*(_e|E)))rr)" ],
-		"comma-dangle": ["error", {
-			"arrays": "always-multiline",
-			"objects": "always-multiline",
-			"imports": "always-multiline",
-			"exports": "always-multiline",
-			"functions": "never"
-		}],
-		"no-empty": ["error", { "allowEmptyCatch": true }],
-		"no-underscore-dangle": "off",
-		"newline-per-chained-call": "off",
-		"no-console": "off",
-		"no-mixed-operators": ["error", { "allowSamePrecedence": true }],
-		"strict": ["error", "global"],
-		"consistent-return": "off",
-		"func-names": "off",
-		"no-tabs": "off",
-		"indent": ["error", "tab"],
-		"no-eq-null": "off",
-		"camelcase": "off",
-		"no-new": "off",
-		"no-shadow": "off",
-		"no-use-before-define": ["error", "nofunc"],
-		"no-prototype-builtins": "off",
-		"new-cap": "off",
-		"no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
-		"import/no-unresolved": "error",
-
-		// ES6
-		"prefer-rest-params": "off",
-		"prefer-spread": "off",
-		"prefer-arrow-callback": "off",
-		"prefer-template": "off",
-		"no-var": "off",
-		"object-shorthand": "off",
-		"vars-on-top": "off",
-
-		// TODO
-		"import/no-extraneous-dependencies": "off",
-		"import/no-dynamic-require": "off",
-		"import/newline-after-import": "off",
-		"no-bitwise": "off",
-		"global-require": "off",
-		"max-len": "off",
-		"no-param-reassign": "off",
-		"no-restricted-syntax": "off",
-		"no-script-url": "off",
-		"default-case": "off",
-		"linebreak-style": "off",
-
-		// "no-multi-assign": "off",
-		// "one-var": "off",
-		// "no-undef": "off",
-		// "max-nested-callbacks": "off",
-		// "no-mixed-requires": "off",
-		// "brace-style": "off",
-		// "max-statements-per-line": "off",
-		// "no-unused-vars": "off",
-		// "no-mixed-spaces-and-tabs": "off",
-		// "no-useless-concat": "off",
-		// "require-jsdoc": "off",
-		// "eqeqeq": "off",
-		// "no-negated-condition": "off",
-		// "one-var-declaration-per-line": "off",
-		// "no-lonely-if": "off",
-		// "radix": "off",
-		// "no-else-return": "off",
-		// "no-useless-escape": "off",
-		// "block-scoped-var": "off",
-		// "operator-assignment": "off",
-		// "yoda": "off",
-		// "no-loop-func": "off",
-		// "no-void": "off",
-		// "valid-jsdoc": "off",
-		// "no-cond-assign": "off",
-		// "no-redeclare": "off",
-		// "no-unreachable": "off",
-		// "no-nested-ternary": "off",
-		// "operator-linebreak": "off",
-		// "guard-for-in": "off",
-		// "no-unneeded-ternary": "off",
-		// "no-sequences": "off",
-		// "no-extend-native": "off",
-		// "no-shadow-restricted-names": "off",
-		// "no-extra-boolean-cast": "off",
-		// "no-path-concat": "off",
-		// "no-unused-expressions": "off",
-		// "no-return-assign": "off",
-		// "no-restricted-modules": "off",
-		// "object-curly-spacing": "off",
-		// "indent": "off",
-		// "padded-blocks": "off",
-		// "eol-last": "off",
-		// "lines-around-directive": "off",
-		// "strict": "off",
-		// "comma-dangle": "off",
-		// "no-multi-spaces": "off",
-		// "quotes": "off",
-		// "keyword-spacing": "off",
-		// "no-mixed-operators": "off",
-		// "comma-spacing": "off",
-		// "no-trailing-spaces": "off",
-		// "key-spacing": "off",
-		// "no-multiple-empty-lines": "off",
-		// "spaced-comment": "off",
-		// "space-in-parens": "off",
-		// "block-spacing": "off",
-		// "quote-props": "off",
-		// "space-unary-ops": "off",
-		// "no-empty": "off",
-		// "dot-notation": "off",
-		// "func-call-spacing": "off",
-		// "array-bracket-spacing": "off",
-		// "object-property-newline": "off",
-		// "no-continue": "off",
-		// "no-extra-semi": "off",
-		// "no-spaced-func": "off",
-		// "no-useless-return": "off"
-	}
+	"extends": "nodebb"
 }

package/index.js

@@ -23,10 +23,13 @@ let parser;
 const Markdown = {
 	config: {},
 	_externalImageCache: undefined,
+	_externalImageFailures: new Set(),
 	onLoad: async function (params) {
 		const controllers = require('./lib/controllers');
 		const hostMiddleware = require.main.require('./src/middleware');
-		const middlewares = [hostMiddleware.maintenanceMode, hostMiddleware.registrationComplete, hostMiddleware.pluginHooks];
+		const middlewares = [
+			hostMiddleware.maintenanceMode, hostMiddleware.registrationComplete, hostMiddleware.pluginHooks,
+		];
 
 		params.router.get('/admin/plugins/markdown', params.middleware.admin.buildHeader, controllers.renderAdmin);
 		params.router.get('/api/admin/plugins/markdown', controllers.renderAdmin);
@@ -46,7 +49,7 @@ const Markdown = {
 		config.markdown = {
 			highlight: Markdown.highlight ? 1 : 0,
 			highlightLinesLanguageList: Markdown.config.highlightLinesLanguageList,
-			theme: highlightTheme || 'default.min.css',
+			theme: highlightTheme || 'default.css',
 			defaultHighlightLanguage: defaultHighlightLanguage || '',
 		};
 
@@ -59,13 +62,10 @@ const Markdown = {
 		hookData.links.push({
 			rel: 'prefetch stylesheet',
 			type: '',
-			href: `${nconf.get('relative_path')}/assets/plugins/nodebb-plugin-markdown/themes/${highlightTheme || 'default.min.css'}`,
+			href: `${nconf.get('relative_path')}/assets/plugins/nodebb-plugin-markdown/styles/${highlightTheme || 'default.css'}`,
 		}, {
 			rel: 'prefetch',
 			href: `${nconf.get('relative_path')}/assets/language/${meta.config.defaultLang || 'en-GB'}/markdown.json?${meta.config['cache-buster']}`,
-		}, {
-			rel: 'prefetch',
-			href: `${nconf.get('relative_path')}/assets/src/modules/highlight.js`,
 		});
 
 		return hookData;
@@ -80,7 +80,7 @@ const Markdown = {
 			langPrefix: 'language-',
 			highlight: true,
 			highlightLinesLanguageList: [],
-			highlightTheme: 'default.min.css',
+			highlightTheme: 'default.css',
 
 			probe: true,
 			probeCacheSize: 256,
@@ -97,12 +97,12 @@ const Markdown = {
 		};
 		const notCheckboxes = ['langPrefix', 'highlightTheme', 'highlightLinesLanguageList', 'probeCacheSize'];
 
-		meta.settings.get('markdown', function (err, options) {
+		meta.settings.get('markdown', (err, options) => {
 			if (err) {
 				winston.warn(`[plugin/markdown] Unable to retrieve settings, assuming defaults: ${err.message}`);
 			}
 
-			for (const field in defaults) {
+			Object.keys(defaults).forEach((field) => {
 				// If not set in config (nil)
 				if (!options.hasOwnProperty(field)) {
 					_self.config[field] = defaults[field];
@@ -111,7 +111,7 @@ const Markdown = {
 				} else {
 					_self.config[field] = options[field];
 				}
-			}
+			});
 
 			_self.highlight = _self.config.highlight;
 			delete _self.config.highlight;
@@ -137,7 +137,7 @@ const Markdown = {
 					name: 'markdown.externalImageCache',
 					max: parseInt(_self.config.probeCacheSize, 10) || 256,
 					length: function () { return 1; },
-					maxAge: 1000 * 60 * 60 * 24,	// 1 day
+					maxAge: 1000 * 60 * 60 * 24, // 1 day
 				});
 			}
 		});
@@ -145,13 +145,11 @@ const Markdown = {
 
 	loadThemes: async () => {
 		try {
-			const files = await fs.promises.readdir(path.resolve(require.main.paths[0], '@highlightjs/cdn-assets/styles'));
+			const files = await fs.promises.readdir(path.join(require.resolve('highlight.js'), '../../styles'));
 			const isStylesheet = /\.css$/;
-			Markdown.themes = files.filter(function (file) {
-				return isStylesheet.test(file);
-			});
+			Markdown.themes = files.filter(file => isStylesheet.test(file));
 		} catch (err) {
-			winston.error('[plugin/markdown] Could not load Markdown themes: ' + err.message);
+			winston.error(`[plugin/markdown] Could not load Markdown themes: ${err.message}`);
 			Markdown.themes = [];
 		}
 	},
@@ -205,17 +203,24 @@ const Markdown = {
 			// eslint-disable-next-line no-cond-assign
 			while ((current = matcher.exec(data.postData.content)) !== null) {
 				const match = current[1];
-				if (match && Markdown.isExternalLink(match)) {	// for security only parse external images
+				if (match && Markdown.isExternalLink(match)) { // for security only parse external images
 					const parsedUrl = url.parse(match);
 					const filename = path.basename(parsedUrl.pathname);
 					const size = Markdown._externalImageCache.get(match);
+
+					// Short-circuit to ignore previous failures
+					const hasFailed = Markdown._externalImageFailures.has(match);
+					if (hasFailed) {
+						return;
+					}
+
 					if (size) {
 						env.images.set(filename, size);
 					} else {
-						try {
-							// eslint-disable-next-line no-await-in-loop
-							const size = await probe(match);
-
+						// Size checked asynchronously, see: https://github.com/tomas/needle/issues/389
+						probe(match, {
+							follow_max: 2,
+						}).then((size) => {
 							let { width, height } = size;
 
 							// Swap width and height if orientation bit is set
@@ -223,11 +228,11 @@ const Markdown = {
 								[width, height] = [height, width];
 							}
 
-							env.images.set(filename, { width, height });
 							Markdown._externalImageCache.set(match, { width, height });
-						} catch (e) {
-							// No handling required
-						}
+						}).catch(() => {
+							// Likely an issue getting the external image size, ignore in the future
+							Markdown._externalImageFailures.add(match);
+						});
 					}
 				}
 			}
@@ -245,13 +250,9 @@ const Markdown = {
 		const execute = function (html) {
 			// Replace all italicised mentions back to regular mentions
 			if (italicMention.test(html)) {
-				html = html.replace(italicMention, function (match, slug) {
-					return '@_' + slug + '_';
-				});
+				html = html.replace(italicMention, (match, slug) => `@_${slug}_`);
 			} else if (boldMention.test(html)) {
-				html = html.replace(boldMention, function (match, slug) {
-					return '@__' + slug + '__';
-				});
+				html = html.replace(boldMention, (match, slug) => `@__${slug}__`);
 			}
 
 			return html;
@@ -330,12 +331,15 @@ const Markdown = {
 
 		// Update renderer to add some classes to all images
 		const renderImage = parser.renderer.rules.image || function (tokens, idx, options, env, self) {
+			// eslint-disable-next-line prefer-spread,prefer-rest-params
 			return self.renderToken.apply(self, arguments);
 		};
 		const renderLink = parser.renderer.rules.link_open || function (tokens, idx, options, env, self) {
+			// eslint-disable-next-line prefer-spread,prefer-rest-params
 			return self.renderToken.apply(self, arguments);
 		};
 		const renderTable = parser.renderer.rules.table_open || function (tokens, idx, options, env, self) {
+			// eslint-disable-next-line prefer-spread,prefer-rest-params
 			return self.renderToken.apply(self, arguments);
 		};
 
@@ -347,7 +351,7 @@ const Markdown = {
 			// Validate the url
 			if (!Markdown.isUrlValid(attributes.get('src'))) { return ''; }
 
-			token.attrSet('class', (token.attrGet('class') || '') + ' img-responsive img-markdown');
+			token.attrSet('class', `${token.attrGet('class') || ''} img-responsive img-markdown`);
 
 			// Append sizes to images
 			if (parsedSrc.pathname) {
@@ -428,7 +432,7 @@ const Markdown = {
 		 * get updated.
 		 */
 		const allowedRoots = [nconf.get('upload_url'), '/uploads'];
-		const allowed = (pathname) => allowedRoots.some((root) => pathname.toString().startsWith(root) || pathname.toString().startsWith(nconf.get('relative_path') + root));
+		const allowed = pathname => allowedRoots.some(root => pathname.toString().startsWith(root) || pathname.toString().startsWith(nconf.get('relative_path') + root));
 
 		try {
 			const urlObj = url.parse(src, false, true);
@@ -449,9 +453,12 @@ const Markdown = {
 		}
 
 		if (
-			urlObj.host === null	// Relative paths are always internal links...
-			|| (urlObj.host === baseUrlObj.host && urlObj.protocol === baseUrlObj.protocol	// Otherwise need to check that protocol and host match
-				&& (nconf.get('relative_path').length > 0 ? urlObj.pathname.indexOf(nconf.get('relative_path')) === 0 : true))	// Subfolder installs need this additional check
+			urlObj.host === null || // Relative paths are always internal links...
+			(
+				urlObj.host === baseUrlObj.host &&
+				urlObj.protocol === baseUrlObj.protocol && // Otherwise need to check that protocol and host match
+				(nconf.get('relative_path').length > 0 ? urlObj.pathname.indexOf(nconf.get('relative_path')) === 0 : true) // Subfolder installs need this additional check
+			)
 		) {
 			return false;
 		}

package/lib/controllers.js

@@ -17,7 +17,7 @@ Controllers.retrieveRaw = function retrieveRaw(req, res, next) {
 		return next();
 	}
 
-	posts.getPostField(pid, 'content', function (err, content) {
+	posts.getPostField(pid, 'content', (err, content) => {
 		if (err) {
 			return next(err);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "9.0.8",
+  "version": "10.0.0",
   "description": "A Markdown parser for NodeBB",
   "main": "index.js",
   "repository": {
@@ -19,8 +19,8 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+      "pre-commit": "npx lint-staged",
+      "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "lint-staged": {
@@ -29,7 +29,7 @@
     ]
   },
   "dependencies": {
-    "@highlightjs/cdn-assets": "^11.4.0",
+    "highlight.js": "11.4.0",
     "highlightjs-line-numbers.js": "^2.8.0",
     "markdown-it": "^12.0.6",
     "markdown-it-checkbox": "^1.1.0",
@@ -37,15 +37,15 @@
     "probe-image-size": "^7.2.1"
   },
   "nbbpm": {
-    "compatibility": "^1.17.0"
+    "compatibility": "^2.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "16.2.1",
     "@commitlint/config-angular": "16.2.1",
-    "eslint": "8.9.0",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-plugin-import": "2.25.4",
+    "eslint": "8.x",
+    "eslint-config-nodebb": "0.1.1",
+    "eslint-plugin-import": "2.x",
     "husky": "7.0.4",
-    "lint-staged": "12.3.4"
+    "lint-staged": "12.3.5"
   }
 }

package/plugin.json

@@ -11,11 +11,9 @@
         "public/js/client.js"
     ],
     "staticDirs": {
-        "themes": "../@highlightjs/cdn-assets/styles"
+        "styles": "node_modules/highlight.js/styles"
     },
     "modules": {
-        "highlight.js": "../@highlightjs/cdn-assets/highlight.min.js",
-        "highlightjs-line-numbers.js": "./public/js/highlightjs-line-numbers.js",
         "../admin/plugins/markdown.js": "./public/js/admin.js"
     },
     "languages": "public/languages",
@@ -36,6 +34,7 @@
         { "hook": "filter:sanitize.config", "method": "updateSanitizeConfig" }
     ],
     "upgrades": [
-        "upgrades/reset_md_hljs_theme.js"
+        "upgrades/reset_md_hljs_theme.js",
+        "upgrades/use_unminified_hljs_theme.js"
     ]
 }

package/public/js/.eslintrc

@@ -0,0 +1,3 @@
+{
+	"extends": "nodebb/public"
+}

package/public/js/admin.js

@@ -17,7 +17,7 @@ define('admin/plugins/markdown', ['settings', 'alerts'], function (Settings, ale
 				langPrefix: 'language-',
 				highlight: true,
 				highlightLinesLanguageList: [],
-				highlightTheme: 'default.min.css',
+				highlightTheme: 'default.css',
 
 				probe: true,
 				probeCacheSize: 256,

package/public/js/client.js

@@ -1,7 +1,5 @@
 'use strict';
 
-/* global window, jQuery, $, config, socket */
-
 (function () {
 	var Markdown = {};
 
@@ -33,13 +31,14 @@
 				// 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().reduce(function (memo, cur, index) {
-					if (cur === _this) {
-						memo = index;
-					}
+				var index = $(this).parents('.content').find('input[type="checkbox"]').toArray()
+					.reduce(function (memo, cur, index) {
+						if (cur === _this) {
+							memo = index;
+						}
 
-					return memo;
-				}, null);
+						return memo;
+					}, null);
 
 				socket.emit('plugins.markdown.checkbox.edit', {
 					pid: pid,
@@ -119,11 +118,15 @@
 								controls.updateTextareaSelection(textarea, selectionStart + 2, selectionStart + 2);
 							} else {
 								controls.insertIntoTextarea(textarea, '**' + strings.bold + '**');
-								controls.updateTextareaSelection(textarea, selectionStart + 2, selectionStart + strings.bold.length + 2);
+								controls.updateTextareaSelection(
+									textarea, selectionStart + 2, selectionStart + strings.bold.length + 2
+								);
 							}
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '**');
-							controls.updateTextareaSelection(textarea, selectionStart + 2 + wrapDelta[0], selectionEnd + 2 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 2 + wrapDelta[0], selectionEnd + 2 - wrapDelta[1]
+							);
 						}
 					});
 
@@ -136,11 +139,15 @@
 								controls.updateTextareaSelection(textarea, selectionStart + 1, selectionStart + 1);
 							} else {
 								controls.insertIntoTextarea(textarea, '*' + strings.italic + '*');
-								controls.updateTextareaSelection(textarea, selectionStart + 1, selectionStart + strings.italic.length + 1);
+								controls.updateTextareaSelection(
+									textarea, selectionStart + 1, selectionStart + strings.italic.length + 1
+								);
 							}
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '*');
-							controls.updateTextareaSelection(textarea, selectionStart + 1 + wrapDelta[0], selectionEnd + 1 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 1 + wrapDelta[0], selectionEnd + 1 - wrapDelta[1]
+							);
 						}
 					});
 
@@ -149,10 +156,14 @@
 							controls.insertIntoTextarea(textarea, '\n* ' + strings.list_item);
 
 							// Highlight "list item"
-							controls.updateTextareaSelection(textarea, selectionStart + 3, selectionStart + strings.list_item.length + 3);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 3, selectionStart + strings.list_item.length + 3
+							);
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '\n* ', '');
-							controls.updateTextareaSelection(textarea, selectionStart + 3 + wrapDelta[0], selectionEnd + 3 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 3 + wrapDelta[0], selectionEnd + 3 - wrapDelta[1]
+							);
 						}
 					});
 
@@ -165,41 +176,61 @@
 								controls.updateTextareaSelection(textarea, selectionStart + 2, selectionStart + 2);
 							} else {
 								controls.insertIntoTextarea(textarea, '~~' + strings.strikethrough_text + '~~');
-								controls.updateTextareaSelection(textarea, selectionStart + 2, selectionEnd + strings.strikethrough_text.length + 2);
+								controls.updateTextareaSelection(
+									textarea, selectionStart + 2, selectionEnd + strings.strikethrough_text.length + 2
+								);
 							}
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '~~', '~~');
-							controls.updateTextareaSelection(textarea, selectionStart + 2 + wrapDelta[0], selectionEnd + 2 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 2 + wrapDelta[0], selectionEnd + 2 - wrapDelta[1]
+							);
 						}
 					});
 
 					formatting.addButtonDispatch('code', function (textarea, selectionStart, selectionEnd) {
 						if (selectionStart === selectionEnd) {
 							controls.insertIntoTextarea(textarea, '```\n' + strings.code_text + '\n```');
-							controls.updateTextareaSelection(textarea, selectionStart + 4, selectionEnd + strings.code_text.length + 4);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 4, selectionEnd + strings.code_text.length + 4
+							);
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '```\n', '\n```');
-							controls.updateTextareaSelection(textarea, selectionStart + 4 + wrapDelta[0], selectionEnd + 4 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionStart + 4 + wrapDelta[0], selectionEnd + 4 - wrapDelta[1]
+							);
 						}
 					});
 
 					formatting.addButtonDispatch('link', function (textarea, selectionStart, selectionEnd) {
 						if (selectionStart === selectionEnd) {
 							controls.insertIntoTextarea(textarea, '[' + strings.link_text + '](' + strings.link_url + ')');
-							controls.updateTextareaSelection(textarea, selectionStart + strings.link_text.length + 3, selectionEnd + strings.link_text.length + strings.link_url.length + 3);
+							controls.updateTextareaSelection(
+								textarea,
+								selectionStart + strings.link_text.length + 3,
+								selectionEnd + strings.link_text.length + strings.link_url.length + 3
+							);
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '[', '](' + strings.link_url + ')');
-							controls.updateTextareaSelection(textarea, selectionEnd + 3 - wrapDelta[1], selectionEnd + strings.link_url.length + 3 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionEnd + 3 - wrapDelta[1], selectionEnd + strings.link_url.length + 3 - wrapDelta[1]
+							);
 						}
 					});
 
 					formatting.addButtonDispatch('picture-o', function (textarea, selectionStart, selectionEnd) {
 						if (selectionStart === selectionEnd) {
 							controls.insertIntoTextarea(textarea, '![' + strings.picture_text + '](' + strings.picture_url + ')');
-							controls.updateTextareaSelection(textarea, selectionStart + strings.picture_text.length + 4, selectionEnd + strings.picture_text.length + strings.picture_url.length + 4);
+							controls.updateTextareaSelection(
+								textarea,
+								selectionStart + strings.picture_text.length + 4,
+								selectionEnd + strings.picture_text.length + strings.picture_url.length + 4
+							);
 						} else {
 							var wrapDelta = controls.wrapSelectionInTextareaWith(textarea, '![', '](' + strings.picture_url + ')');
-							controls.updateTextareaSelection(textarea, selectionEnd + 4 - wrapDelta[1], selectionEnd + strings.picture_url.length + 4 - wrapDelta[1]);
+							controls.updateTextareaSelection(
+								textarea, selectionEnd + 4 - wrapDelta[1], selectionEnd + strings.picture_url.length + 4 - wrapDelta[1]
+							);
 						}
 					});
 				});
@@ -207,30 +238,32 @@
 		});
 	};
 
-	function highlight(elements) {
+	async function highlight(elements) {
 		if (parseInt(config.markdown.highlight, 10)) {
-			require(['highlight', 'highlightjs-line-numbers'], function () {
-				elements.each(function (i, block) {
-					$(block.parentNode).addClass('markdown-highlight');
+			const { default: hljs } = await import('highlight.js/lib/common');
+			window.hljs = hljs;
+			require('highlightjs-line-numbers.js');
 
-					// Default language if set in ACP
-					if (!Array.prototype.some.call(block.classList, (className) => className.startsWith('language-')) && config.markdown.defaultHighlightLanguage) {
-						block.classList.add(`language-${config.markdown.defaultHighlightLanguage}`);
-					}
+			elements.each(function (i, block) {
+				$(block.parentNode).addClass('markdown-highlight');
 
-					window.hljs.highlightElement(block);
+				// Default language if set in ACP
+				if (!Array.prototype.some.call(block.classList, (className) => className.startsWith('language-')) && config.markdown.defaultHighlightLanguage) {
+					block.classList.add(`language-${config.markdown.defaultHighlightLanguage}`);
+				}
 
-					// Check detected language against whitelist and add lines if enabled
-					if (block.className.split(' ').map(function (className) {
-						if (className.indexOf('language-') === 0) {
-							className = className.slice(9);
-						}
-						return config.markdown.highlightLinesLanguageList.includes(className) || config.markdown.highlightLinesLanguageList.includes(className);
-					}).some(Boolean)) {
-						$(block).attr('data-lines', 1);
-						window.hljs.lineNumbersBlock(block);
+				window.hljs.highlightElement(block);
+
+				// Check detected language against whitelist and add lines if enabled
+				if (block.className.split(' ').map(function (className) {
+					if (className.indexOf('language-') === 0) {
+						className = className.slice(9);
 					}
-				});
+					return config.markdown.highlightLinesLanguageList.includes(className) || config.markdown.highlightLinesLanguageList.includes(className);
+				}).some(Boolean)) {
+					$(block).attr('data-lines', 1);
+					window.hljs.lineNumbersBlock(block);
+				}
 			});
 		}
 	}

package/upgrades/use_unminified_hljs_theme.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+
+module.exports = {
+	name: 'Update Markdown Theme to point to unminified file',
+	timestamp: Date.UTC(2022, 1, 17),
+	method: async () => {
+		const { highlightTheme } = await meta.settings.get('markdown');
+		if (highlightTheme) {
+			await meta.settings.setOne('markdown', 'highlightTheme', highlightTheme.replace('.min.css', '.css'));
+		}
+	},
+};

package/.eslintignore

@@ -1,2 +0,0 @@
-public/js/highlight.js
-public/js/highlightjs-line-numbers.js

package/public/js/highlightjs-line-numbers.js

@@ -1,373 +0,0 @@
-/**
- * STOP! This file was edited from the version found in the repo
- * https://github.com/wcoder/highlightjs-line-numbers.js
- *
- * Changes:
- *   - Made into a requirejs module
- *   - Instead of passing window, document in as w and d, they
- *     are defined at top of module
- */
-define('highlightjs-line-numbers', ['highlight'], function () {
-	var w = window;
-	var d = document;
-
-    var TABLE_NAME = 'hljs-ln',
-        LINE_NAME = 'hljs-ln-line',
-        CODE_BLOCK_NAME = 'hljs-ln-code',
-        NUMBERS_BLOCK_NAME = 'hljs-ln-numbers',
-        NUMBER_LINE_NAME = 'hljs-ln-n',
-        DATA_ATTR_NAME = 'data-line-number',
-        BREAK_LINE_REGEXP = /\r\n|\r|\n/g;
-
-    if (w.hljs) {
-        w.hljs.initLineNumbersOnLoad = initLineNumbersOnLoad;
-        w.hljs.lineNumbersBlock = lineNumbersBlock;
-        w.hljs.lineNumbersValue = lineNumbersValue;
-
-        addStyles();
-    } else {
-        w.console.error('highlight.js not detected!');
-    }
-
-    function isHljsLnCodeDescendant(domElt) {
-        var curElt = domElt;
-        while (curElt) {
-            if (curElt.className && curElt.className.indexOf('hljs-ln-code') !== -1) {
-                return true;
-            }
-            curElt = curElt.parentNode;
-        }
-        return false;
-    }
-
-    function getHljsLnTable(hljsLnDomElt) {
-        var curElt = hljsLnDomElt;
-        while (curElt.nodeName !== 'TABLE') {
-            curElt = curElt.parentNode;
-        }
-        return curElt;
-    }
-
-    // Function to workaround a copy issue with Microsoft Edge.
-    // Due to hljs-ln wrapping the lines of code inside a <table> element,
-    // itself wrapped inside a <pre> element, window.getSelection().toString()
-    // does not contain any line breaks. So we need to get them back using the
-    // rendered code in the DOM as reference.
-    function edgeGetSelectedCodeLines(selection) {
-        // current selected text without line breaks
-        var selectionText = selection.toString();
-
-        // get the <td> element wrapping the first line of selected code
-        var tdAnchor = selection.anchorNode;
-        while (tdAnchor.nodeName !== 'TD') {
-            tdAnchor = tdAnchor.parentNode;
-        }
-
-        // get the <td> element wrapping the last line of selected code
-        var tdFocus = selection.focusNode;
-        while (tdFocus.nodeName !== 'TD') {
-            tdFocus = tdFocus.parentNode;
-        }
-
-        // extract line numbers
-        var firstLineNumber = parseInt(tdAnchor.dataset.lineNumber);
-        var lastLineNumber = parseInt(tdFocus.dataset.lineNumber);
-
-        // multi-lines copied case
-        if (firstLineNumber != lastLineNumber) {
-
-            var firstLineText = tdAnchor.textContent;
-            var lastLineText = tdFocus.textContent;
-
-            // if the selection was made backward, swap values
-            if (firstLineNumber > lastLineNumber) {
-                var tmp = firstLineNumber;
-                firstLineNumber = lastLineNumber;
-                lastLineNumber = tmp;
-                tmp = firstLineText;
-                firstLineText = lastLineText;
-                lastLineText = tmp;
-            }
-
-            // discard not copied characters in first line
-            while (selectionText.indexOf(firstLineText) !== 0) {
-                firstLineText = firstLineText.slice(1);
-            }
-
-            // discard not copied characters in last line
-            while (selectionText.lastIndexOf(lastLineText) === -1) {
-                lastLineText = lastLineText.slice(0, -1);
-            }
-
-            // reconstruct and return the real copied text
-            var selectedText = firstLineText;
-            var hljsLnTable = getHljsLnTable(tdAnchor);
-            for (var i = firstLineNumber + 1 ; i < lastLineNumber ; ++i) {
-                var codeLineSel = format('.{0}[{1}="{2}"]', [CODE_BLOCK_NAME, DATA_ATTR_NAME, i]);
-                var codeLineElt = hljsLnTable.querySelector(codeLineSel);
-                selectedText += '\n' + codeLineElt.textContent;
-            }
-            selectedText += '\n' + lastLineText;
-            return selectedText;
-        // single copied line case
-        } else {
-            return selectionText;
-        }
-    }
-
-    // ensure consistent code copy/paste behavior across all browsers
-    // (see https://github.com/wcoder/highlightjs-line-numbers.js/issues/51)
-    document.addEventListener('copy', function(e) {
-        // get current selection
-        var selection = window.getSelection();
-        // override behavior when one wants to copy line of codes
-        if (isHljsLnCodeDescendant(selection.anchorNode)) {
-            var selectionText;
-            // workaround an issue with Microsoft Edge as copied line breaks
-            // are removed otherwise from the selection string
-            if (window.navigator.userAgent.indexOf('Edge') !== -1) {
-                selectionText = edgeGetSelectedCodeLines(selection);
-            } else {
-                // other browsers can directly use the selection string
-                selectionText = selection.toString();
-            }
-            e.clipboardData.setData('text/plain', selectionText);
-            e.preventDefault();
-        }
-    });
-
-    function addStyles () {
-        var css = d.createElement('style');
-        css.type = 'text/css';
-        css.innerHTML = format(
-            '.{0}{border-collapse:collapse}' +
-            '.{0} td{padding:0}' +
-            '.{1}:before{content:attr({2})}',
-        [
-            TABLE_NAME,
-            NUMBER_LINE_NAME,
-            DATA_ATTR_NAME
-        ]);
-        d.getElementsByTagName('head')[0].appendChild(css);
-    }
-
-    function initLineNumbersOnLoad (options) {
-        if (d.readyState === 'interactive' || d.readyState === 'complete') {
-            documentReady(options);
-        } else {
-            w.addEventListener('DOMContentLoaded', function () {
-                documentReady(options);
-            });
-        }
-    }
-
-    function documentReady (options) {
-        try {
-            var blocks = d.querySelectorAll('code.hljs,code.nohighlight');
-
-            for (var i in blocks) {
-                if (blocks.hasOwnProperty(i)) {
-                    if (!isPluginDisabledForBlock(blocks[i])) {
-                        lineNumbersBlock(blocks[i], options);
-                    }
-                }
-            }
-        } catch (e) {
-            w.console.error('LineNumbers error: ', e);
-        }
-    }
-
-    function isPluginDisabledForBlock(element) {
-        return element.classList.contains('nohljsln');
-    }
-
-    function lineNumbersBlock (element, options) {
-        if (typeof element !== 'object') return;
-
-        async(function () {
-            element.innerHTML = lineNumbersInternal(element, options);
-        });
-    }
-
-    function lineNumbersValue (value, options) {
-        if (typeof value !== 'string') return;
-
-        var element = document.createElement('code')
-        element.innerHTML = value
-
-        return lineNumbersInternal(element, options);
-    }
-
-    function lineNumbersInternal (element, options) {
-
-        var internalOptions = mapOptions(element, options);
-
-        duplicateMultilineNodes(element);
-
-        return addLineNumbersBlockFor(element.innerHTML, internalOptions);
-    }
-
-    function addLineNumbersBlockFor (inputHtml, options) {
-        var lines = getLines(inputHtml);
-
-        // if last line contains only carriage return remove it
-        if (lines[lines.length-1].trim() === '') {
-            lines.pop();
-        }
-
-        if (lines.length > 1 || options.singleLine) {
-            var html = '';
-
-            for (var i = 0, l = lines.length; i < l; i++) {
-                html += format(
-                    '<tr>' +
-                        '<td class="{0} {1}" {3}="{5}">' +
-                            '<div class="{2}" {3}="{5}"></div>' +
-                        '</td>' +
-                        '<td class="{0} {4}" {3}="{5}">' +
-                            '{6}' +
-                        '</td>' +
-                    '</tr>',
-                [
-                    LINE_NAME,
-                    NUMBERS_BLOCK_NAME,
-                    NUMBER_LINE_NAME,
-                    DATA_ATTR_NAME,
-                    CODE_BLOCK_NAME,
-                    i + options.startFrom,
-                    lines[i].length > 0 ? lines[i] : ' '
-                ]);
-            }
-
-            return format('<table class="{0}">{1}</table>', [ TABLE_NAME, html ]);
-        }
-
-        return inputHtml;
-    }
-
-    /**
-     * @param {HTMLElement} element Code block.
-     * @param {Object} options External API options.
-     * @returns {Object} Internal API options.
-     */
-    function mapOptions (element, options) {
-        options = options || {};
-        return {
-            singleLine: getSingleLineOption(options),
-            startFrom: getStartFromOption(element, options)
-        };
-    }
-
-    function getSingleLineOption (options) {
-        var defaultValue = false;
-        if (!!options.singleLine) {
-            return options.singleLine;
-        }
-        return defaultValue;
-    }
-
-    function getStartFromOption (element, options) {
-        var defaultValue = 1;
-        var startFrom = defaultValue;
-
-        if (isFinite(options.startFrom)) {
-            startFrom = options.startFrom;
-        }
-
-        // can be overridden because local option is priority
-        var value = getAttribute(element, 'data-ln-start-from');
-        if (value !== null) {
-            startFrom = toNumber(value, defaultValue);
-        }
-
-        return startFrom;
-    }
-
-    /**
-     * Recursive method for fix multi-line elements implementation in highlight.js
-     * Doing deep passage on child nodes.
-     * @param {HTMLElement} element
-     */
-    function duplicateMultilineNodes (element) {
-        var nodes = element.childNodes;
-        for (var node in nodes) {
-            if (nodes.hasOwnProperty(node)) {
-                var child = nodes[node];
-                if (getLinesCount(child.textContent) > 0) {
-                    if (child.childNodes.length > 0) {
-                        duplicateMultilineNodes(child);
-                    } else {
-                        duplicateMultilineNode(child.parentNode);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Method for fix multi-line elements implementation in highlight.js
-     * @param {HTMLElement} element
-     */
-    function duplicateMultilineNode (element) {
-        var className = element.className;
-
-        if ( ! /hljs-/.test(className)) return;
-
-        var lines = getLines(element.innerHTML);
-
-        for (var i = 0, result = ''; i < lines.length; i++) {
-            var lineText = lines[i].length > 0 ? lines[i] : ' ';
-            result += format('<span class="{0}">{1}</span>\n', [ className,  lineText ]);
-        }
-
-        element.innerHTML = result.trim();
-    }
-
-    function getLines (text) {
-        if (text.length === 0) return [];
-        return text.split(BREAK_LINE_REGEXP);
-    }
-
-    function getLinesCount (text) {
-        return (text.trim().match(BREAK_LINE_REGEXP) || []).length;
-    }
-
-    ///
-    /// HELPERS
-    ///
-
-    function async (func) {
-        w.setTimeout(func, 0);
-    }
-
-    /**
-     * {@link https://wcoder.github.io/notes/string-format-for-string-formating-in-javascript}
-     * @param {string} format
-     * @param {array} args
-     */
-    function format (format, args) {
-        return format.replace(/\{(\d+)\}/g, function(m, n){
-            return args[n] !== undefined ? args[n] : m;
-        });
-    }
-
-    /**
-     * @param {HTMLElement} element Code block.
-     * @param {String} attrName Attribute name.
-     * @returns {String} Attribute value or empty.
-     */
-    function getAttribute (element, attrName) {
-        return element.hasAttribute(attrName) ? element.getAttribute(attrName) : null;
-    }
-
-    /**
-     * @param {String} str Source string.
-     * @param {Number} fallback Fallback value.
-     * @returns Parsed number or fallback value.
-     */
-    function toNumber (str, fallback) {
-        if (!str) return fallback;
-        var number = Number(str);
-        return isFinite(number) ? number : fallback;
-    }
-});