Skip to content

Commit

Permalink
update: markedjs v13 adopt gtion
Browse files Browse the repository at this point in the history
  • Loading branch information
Koooooo-7 committed Jul 17, 2024
1 parent 90c0b02 commit 7af181a
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 18 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.2",
"marked": "^12.0.2",
"marked": "^13.0.2",
"npm-run-all": "^4.1.5",
"postcss-cli": "^11.0.0",
"prettier": "^3.2.5",
Expand Down
7 changes: 4 additions & 3 deletions src/core/render/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,10 @@ export class Compiler {
* @param {Number} level Type of heading (h<level> tag)
* @returns {String} Heading element
*/
origin.heading = renderer.heading = function (text, level) {
origin.heading = renderer.heading = function ({ tokens, depth }) {
const text = this.parser.parseInline(tokens);
let { str, config } = getAndRemoveConfig(text);
const nextToc = { level, title: str };
const nextToc = { depth, title: str };

const { content, ignoreAllSubs, ignoreSubHeading } =
getAndRemoveDocisfyIgnoreConfig(str);
Expand All @@ -229,7 +230,7 @@ export class Compiler {
// elements after navigation. This is preferred over focusing on the link
// within the heading because it matches the focus behavior of screen
// readers when navigating page content.
return `<h${level} id="${slug}" tabindex="-1"><a href="${url}" data-id="${slug}" class="anchor"><span>${str}</span></a></h${level}>`;
return `<h${depth} id="${slug}" tabindex="-1"><a href="${url}" data-id="${slug}" class="anchor"><span>${str}</span></a></h${depth}>`;
};

origin.code = highlightCodeCompiler({ renderer });
Expand Down
8 changes: 4 additions & 4 deletions src/core/render/compiler/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import Prism from 'prismjs';
import 'prismjs/components/prism-markup-templating.js';

export const highlightCodeCompiler = ({ renderer }) =>
(renderer.code = function (code, lang = 'markup') {
(renderer.code = ({ text, lang = 'markup' }) => {
const langOrMarkup = Prism.languages[lang] || Prism.languages.markup;
const text = Prism.highlight(
code.replace(/@DOCSIFY_QM@/g, '`'),
const code = Prism.highlight(
text.replace(/@DOCSIFY_QM@/g, '`'),
langOrMarkup,
lang,
);

return /* html */ `<pre data-lang="${lang}"><code class="lang-${lang}" tabindex="0">${text}</code></pre>`;
return /* html */ `<pre data-lang="${lang}"><code class="lang-${lang}" tabindex="0">${code}</code></pre>`;
});
2 changes: 1 addition & 1 deletion src/core/render/compiler/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getAndRemoveConfig } from '../utils.js';
import { isAbsolutePath, getPath, getParentPath } from '../../router/util.js';

export const imageCompiler = ({ renderer, contentBase, router }) =>
(renderer.image = (href, title, text) => {
(renderer.image = ({ href, title, text }) => {
let url = href;
const attrs = [];

Expand Down
3 changes: 2 additions & 1 deletion src/core/render/compiler/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ export const linkCompiler = ({
linkRel,
compilerClass,
}) =>
(renderer.link = (href, title = '', text) => {
(renderer.link = function ({ href, title = '', tokens }) {
const text = this.parser?.parseInline(tokens) || '';
const attrs = [];
const { str, config } = getAndRemoveConfig(title);
linkTarget = config.target || linkTarget;
Expand Down
3 changes: 2 additions & 1 deletion src/core/render/compiler/paragraph.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { helper as helperTpl } from '../tpl.js';

export const paragraphCompiler = ({ renderer }) =>
(renderer.paragraph = text => {
(renderer.paragraph = function ({ tokens }) {
const text = this.parser.parseInline(tokens);
let result;
if (/^!&gt;/.test(text)) {
result = helperTpl('tip', text);
Expand Down
11 changes: 10 additions & 1 deletion src/core/render/compiler/taskList.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
export const taskListCompiler = ({ renderer }) =>
(renderer.list = (body, ordered, start) => {
(renderer.list = function (token) {
const ordered = token.ordered;
const start = token.start;

let body = '';
for (let j = 0; j < token.items.length; j++) {
const item = token.items[j];
body += this.listitem(item);
}

const isTaskList = /<li class="task-list-item">/.test(
body.split('class="task-list"')[0],
);
Expand Down
6 changes: 4 additions & 2 deletions src/core/render/compiler/taskListItem.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export const taskListItemCompiler = ({ renderer }) =>
(renderer.listitem = text => {
const isTaskItem = /^(<input.*type="checkbox"[^>]*>)/.test(text);
(renderer.listitem = function (item) {
const isTaskItem = item.task;
const text = this.parser.parse(item.tokens) || '';

const html = isTaskItem
? /* html */ `<li class="task-list-item"><label>${text}</label></li>`
: /* html */ `<li>${text}</li>`;
Expand Down

0 comments on commit 7af181a

Please sign in to comment.