mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-21 01:25:55 +02:00
Use a own marked instance for the MarkdownController instead of the global one
This prevents from configuring plugins multiple times which can lead to a heap overflow. This fixes issue #478
This commit is contained in:
parent
9e28d39095
commit
f83d4103a6
1 changed files with 23 additions and 6 deletions
|
@ -20,18 +20,26 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import { Controller } from '@hotwired/stimulus';
|
import { Controller } from '@hotwired/stimulus';
|
||||||
import { marked } from "marked";
|
import { Marked } from "marked";
|
||||||
import { mangle } from "marked-mangle";
|
import { mangle } from "marked-mangle";
|
||||||
import { gfmHeadingId } from "marked-gfm-heading-id";
|
import { gfmHeadingId } from "marked-gfm-heading-id";
|
||||||
import DOMPurify from 'dompurify';
|
import DOMPurify from 'dompurify';
|
||||||
|
|
||||||
import "../../css/app/markdown.css";
|
import "../../css/app/markdown.css";
|
||||||
|
|
||||||
export default class extends Controller {
|
export default class MarkdownController extends Controller {
|
||||||
|
|
||||||
|
static _marked = new Marked([
|
||||||
|
{
|
||||||
|
gfm: true,
|
||||||
|
},
|
||||||
|
gfmHeadingId(),
|
||||||
|
mangle(),
|
||||||
|
])
|
||||||
|
;
|
||||||
|
|
||||||
connect()
|
connect()
|
||||||
{
|
{
|
||||||
this.configureMarked();
|
|
||||||
this.render();
|
this.render();
|
||||||
|
|
||||||
//Dispatch an event that we are now finished
|
//Dispatch an event that we are now finished
|
||||||
|
@ -45,7 +53,7 @@ export default class extends Controller {
|
||||||
let raw = this.element.dataset['markdown'];
|
let raw = this.element.dataset['markdown'];
|
||||||
|
|
||||||
//Apply purified parsed markdown
|
//Apply purified parsed markdown
|
||||||
this.element.innerHTML = DOMPurify.sanitize(marked(this.unescapeHTML(raw)));
|
this.element.innerHTML = DOMPurify.sanitize(MarkdownController._marked.parse(this.unescapeHTML(raw)));
|
||||||
|
|
||||||
for(let a of this.element.querySelectorAll('a')) {
|
for(let a of this.element.querySelectorAll('a')) {
|
||||||
//Mark all links as external
|
//Mark all links as external
|
||||||
|
@ -81,8 +89,17 @@ export default class extends Controller {
|
||||||
/**
|
/**
|
||||||
* Configure the marked parser
|
* Configure the marked parser
|
||||||
*/
|
*/
|
||||||
configureMarked()
|
/*static newMarked()
|
||||||
{
|
{
|
||||||
|
const marked = new Marked([
|
||||||
|
{
|
||||||
|
gfm: true,
|
||||||
|
},
|
||||||
|
gfmHeadingId(),
|
||||||
|
mangle(),
|
||||||
|
])
|
||||||
|
;
|
||||||
|
|
||||||
marked.use(mangle());
|
marked.use(mangle());
|
||||||
marked.use(gfmHeadingId({
|
marked.use(gfmHeadingId({
|
||||||
}));
|
}));
|
||||||
|
@ -90,5 +107,5 @@ export default class extends Controller {
|
||||||
marked.setOptions({
|
marked.setOptions({
|
||||||
gfm: true,
|
gfm: true,
|
||||||
});
|
});
|
||||||
}
|
}*/
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue