${transformedCode}`;
};
diff --git a/src/LiquidHighlightTag.js b/src/LiquidHighlightTag.js
deleted file mode 100644
index 26eb7ce..0000000
--- a/src/LiquidHighlightTag.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const HighlightPairedShortcode = require("./HighlightPairedShortcode");
-
-class LiquidHighlightTag {
- constructor(liquidEngine) {
- this.liquidEngine = liquidEngine;
- }
-
- getObject(options = {}) {
- let ret = function(highlighter) {
- return {
- parse: function(tagToken, remainTokens) {
- let split = tagToken.args.split(" ");
-
- this.language = split.shift();
- this.highlightLines = split.join(" ");
-
- this.tokens = [];
-
- var stream = highlighter.liquidEngine.parser.parseStream(remainTokens);
-
- stream
- .on("token", token => {
- if (token.name === "endhighlight") {
- stream.stop();
- } else {
- this.tokens.push(token);
- }
- })
- .on("end", x => {
- throw new Error(`tag ${tagToken.getText()} not closed`);
- });
-
- stream.start();
- },
- render: function(scope, hash) {
- let tokens = this.tokens.map(token => {
- return token.raw || token.getText();
- });
- let tokenStr = tokens.join("").trim();
- return Promise.resolve(HighlightPairedShortcode(tokenStr, this.language, this.highlightLines, options));
- }
- };
- };
-
- return ret(this);
- }
-}
-
-module.exports = LiquidHighlightTag;
diff --git a/src/PrismLoader.js b/src/PrismLoader.js
index 5fa6007..ab9e325 100644
--- a/src/PrismLoader.js
+++ b/src/PrismLoader.js
@@ -1,16 +1,17 @@
-const Prism = require("prismjs");
-const PrismLoader = require("prismjs/components/index.js");
+import Prism from "prismjs";
+import PrismLoader from "prismjs/components/index.js";
+
// Avoid "Language does not exist: " console logs
PrismLoader.silent = true;
-require("prismjs/components/prism-diff.js");
+import "prismjs/components/prism-diff.js";
// Load diff-highlight plugin
-require("prismjs/plugins/diff-highlight/prism-diff-highlight");
+import "prismjs/plugins/diff-highlight/prism-diff-highlight.js";
-const PrismAlias = require("./PrismNormalizeAlias");
+import PrismAlias from "./PrismNormalizeAlias.js";
-module.exports = function(language, options = {}) {
+export default function(language, options = {}) {
let diffRemovedRawName = language;
if(language.startsWith("diff-")) {
diffRemovedRawName = language.substr("diff-".length);
diff --git a/src/PrismNormalizeAlias.js b/src/PrismNormalizeAlias.js
index 7738e05..c593c24 100644
--- a/src/PrismNormalizeAlias.js
+++ b/src/PrismNormalizeAlias.js
@@ -3,9 +3,13 @@ const HARDCODED_ALIASES = {
nunjucks: "jinja2",
};
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+
// This was added to make `ts` resolve to `typescript` correctly.
// The Prism loader doesn’t seem to always handle aliasing correctly.
-module.exports = function(language) {
+export default function(language) {
try {
// Careful this is not public API stuff:
// https://github.com/PrismJS/prism/issues/2146
diff --git a/src/getAttributes.js b/src/getAttributes.js
index 603c6a5..cf090a5 100644
--- a/src/getAttributes.js
+++ b/src/getAttributes.js
@@ -1,3 +1,5 @@
+import { escapeAttribute } from "entities/escape";
+
function attributeEntryToString(attribute, context) {
let [key, value] = attribute;
@@ -11,6 +13,9 @@ function attributeEntryToString(attribute, context) {
);
}
+ if(typeof value === "string") {
+ value = escapeAttribute(value);
+ }
return `${key}="${value}"`;
}
@@ -34,7 +39,7 @@ function attributeEntryToString(attribute, context) {
* @param {object} context.options The options passed to the syntax highlighter.
* @returns {string} A string containing the above HTML attributes preceded by a single space.
*/
-function getAttributes(attributes, context = {}) {
+export default function getAttributes(attributes, context = {}) {
let langClass = context.language ? `language-${context.language}` : "";
if (!attributes) {
@@ -58,5 +63,3 @@ function getAttributes(attributes, context = {}) {
throw new Error("Syntax highlighter plugin custom attributes on and must be an object. Received: " + JSON.stringify(attributes));
}
}
-
-module.exports = getAttributes;
diff --git a/src/hasTemplateFormat.js b/src/hasTemplateFormat.js
index ee81e89..677fb34 100644
--- a/src/hasTemplateFormat.js
+++ b/src/hasTemplateFormat.js
@@ -1,10 +1,10 @@
-module.exports = function(templateFormats = ["*"], format = false) {
+export default function(templateFormats = ["*"], format = false) {
if(!Array.isArray(templateFormats)) {
templateFormats = [templateFormats];
}
if( Array.isArray(templateFormats) ) {
- if( templateFormats.indexOf("*") > -1 || templateFormats.indexOf(format) > -1 ) {
+ if(templateFormats.includes("*") || format && templateFormats.includes(format)) {
return true;
}
}
diff --git a/src/markdownSyntaxHighlightOptions.js b/src/markdownSyntaxHighlightOptions.js
deleted file mode 100644
index 098c683..0000000
--- a/src/markdownSyntaxHighlightOptions.js
+++ /dev/null
@@ -1,54 +0,0 @@
-const Prism = require("prismjs");
-const PrismLoader = require("./PrismLoader");
-const HighlightLinesGroup = require("./HighlightLinesGroup");
-const getAttributes = require("./getAttributes");
-
-module.exports = function (options = {}) {
- return function(str, language) {
- if(!language) {
- // empty string means defer to the upstream escaping code built into markdown lib.
- return "";
- }
-
-
- let split = language.split("/");
- if( split.length ) {
- language = split.shift();
- }
-
- let html;
- if(language === "text") {
- html = str;
- } else {
- let loader = PrismLoader(language, options)
- if(!loader) {
- html = str;
- } else {
- html = Prism.highlight(str, loader, language);
- }
- }
-
- let hasHighlightNumbers = split.length > 0;
- let highlights = new HighlightLinesGroup(split.join("/"), "/");
- let lines = html.split("\n");
-
- // Trim last line if it is empty
- if (lines[lines.length - 1] === "") {
- lines = lines.slice(0, -1);
- }
-
- lines = lines.map(function(line, j) {
- if(options.alwaysWrapLineHighlights || hasHighlightNumbers) {
- let lineContent = highlights.getLineMarkup(j, line);
- return lineContent;
- }
- return line;
- });
-
- const context = { content: str, language: language, options: options };
- const preAttributes = getAttributes(options.preAttributes, context);
- const codeAttributes = getAttributes(options.codeAttributes, context);
-
- return `${lines.join(options.lineSeparator || "
")}
`;
- };
-};
diff --git a/syntax-highlight.webc b/syntax-highlight.webc
index d894ea3..54a0bbf 100644
--- a/syntax-highlight.webc
+++ b/syntax-highlight.webc
@@ -1,5 +1,5 @@
-