diff --git a/package-lock.json b/package-lock.json index dce04f7d4..ce3496d48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@types/cors": "^2.8.10", "@types/end-of-stream": "^1.4.0", "@types/lodash.orderby": "^4.6.6", - "@types/marked": "^3.0.0", + "@types/marked": "^4.0.2", "@types/mime-types": "^2.1.0", "@types/n3": "^1.10.0", "@types/node": "^14.18.0", @@ -45,7 +45,7 @@ "handlebars": "^4.7.7", "jose": "^4.3.7", "lodash.orderby": "^4.6.0", - "marked": "^3.0.0", + "marked": "^4.0.12", "mime-types": "^2.1.32", "n3": "^1.12.2", "nodemailer": "^6.6.2", @@ -4767,9 +4767,9 @@ "integrity": "sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==" }, "node_modules/@types/marked": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-3.0.0.tgz", - "integrity": "sha512-vof90OIWT+Tzq3MBRXgV9fsH8PC3WZ4OQg9Qa04vOtP0TcyiNfl7BTonYCmTapHZ5lRZh6ihUYkAy7St1hmk/A==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.2.tgz", + "integrity": "sha512-auNrZ/c0w6wsM9DccwVxWHssrMDezHUAXNesdp2RQrCVCyrQbOiSq7yqdJKrUQQpw9VTm7CGYJH2A/YG7jjrjQ==" }, "node_modules/@types/mime": { "version": "1.3.2", @@ -11630,11 +11630,11 @@ } }, "node_modules/marked": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.3.tgz", - "integrity": "sha512-4oIDhVSQ2s+xNCfek9OnZgCQR/WykGCom02JzIIvi4Pme+MIwPYqvGVW8CQWOXeoZu0TtVB6pTxIuoLm+dKqDA==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz", + "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==", "bin": { - "marked": "bin/marked" + "marked": "bin/marked.js" }, "engines": { "node": ">= 12" @@ -15027,6 +15027,18 @@ "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x || 4.4.x" } }, + "node_modules/typedoc/node_modules/marked": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz", + "integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==", + "dev": true, + "bin": { + "marked": "bin/marked" + }, + "engines": { + "node": ">= 12" + } + }, "node_modules/typescript": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz", @@ -19454,9 +19466,9 @@ "integrity": "sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==" }, "@types/marked": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-3.0.0.tgz", - "integrity": "sha512-vof90OIWT+Tzq3MBRXgV9fsH8PC3WZ4OQg9Qa04vOtP0TcyiNfl7BTonYCmTapHZ5lRZh6ihUYkAy7St1hmk/A==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.2.tgz", + "integrity": "sha512-auNrZ/c0w6wsM9DccwVxWHssrMDezHUAXNesdp2RQrCVCyrQbOiSq7yqdJKrUQQpw9VTm7CGYJH2A/YG7jjrjQ==" }, "@types/mime": { "version": "1.3.2", @@ -24703,9 +24715,9 @@ "dev": true }, "marked": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.3.tgz", - "integrity": "sha512-4oIDhVSQ2s+xNCfek9OnZgCQR/WykGCom02JzIIvi4Pme+MIwPYqvGVW8CQWOXeoZu0TtVB6pTxIuoLm+dKqDA==" + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz", + "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==" }, "media-typer": { "version": "0.3.0", @@ -27339,6 +27351,14 @@ "marked": "^3.0.3", "minimatch": "^3.0.4", "shiki": "^0.9.10" + }, + "dependencies": { + "marked": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz", + "integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==", + "dev": true + } } }, "typescript": { diff --git a/package.json b/package.json index b0dccc52e..0b18422c3 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@types/cors": "^2.8.10", "@types/end-of-stream": "^1.4.0", "@types/lodash.orderby": "^4.6.6", - "@types/marked": "^3.0.0", + "@types/marked": "^4.0.2", "@types/mime-types": "^2.1.0", "@types/n3": "^1.10.0", "@types/node": "^14.18.0", @@ -111,7 +111,7 @@ "handlebars": "^4.7.7", "jose": "^4.3.7", "lodash.orderby": "^4.6.0", - "marked": "^3.0.0", + "marked": "^4.0.12", "mime-types": "^2.1.32", "n3": "^1.12.2", "nodemailer": "^6.6.2", diff --git a/src/storage/conversion/MarkdownToHtmlConverter.ts b/src/storage/conversion/MarkdownToHtmlConverter.ts index 1bbae4d2c..73c8da5bb 100644 --- a/src/storage/conversion/MarkdownToHtmlConverter.ts +++ b/src/storage/conversion/MarkdownToHtmlConverter.ts @@ -1,4 +1,4 @@ -import marked from 'marked'; +import { marked } from 'marked'; import { BasicRepresentation } from '../../http/representation/BasicRepresentation'; import type { Representation } from '../../http/representation/Representation'; import { TEXT_HTML, TEXT_MARKDOWN } from '../../util/ContentTypes';