diff --git a/package.json b/package.json index aede997b85..7d29ed458a 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "leaflet-draw": "1.0.4", "lit": "2.8.0", "luxon": "3.4.0", - "marked": "4.3.0", + "marked": "7.0.2", "memoize-one": "6.0.0", "node-vibrant": "3.2.1-alpha.1", "proxy-polyfill": "0.3.2", @@ -177,7 +177,6 @@ "@types/leaflet": "1.9.3", "@types/leaflet-draw": "1.0.7", "@types/luxon": "3.3.1", - "@types/marked": "4.3.1", "@types/mocha": "10.0.1", "@types/qrcode": "1.5.1", "@types/serve-handler": "6.1.1", diff --git a/src/resources/markdown-worker.ts b/src/resources/markdown-worker.ts index bc653a0587..8cf35f4422 100644 --- a/src/resources/markdown-worker.ts +++ b/src/resources/markdown-worker.ts @@ -1,7 +1,7 @@ // To use comlink under ES5 import "proxy-polyfill"; import { expose } from "comlink"; -import { marked } from "marked"; +import { marked, MarkedOptions } from "marked"; import { filterXSS, getDefaultWhiteList, IWhiteList } from "xss"; let whiteListNormal: IWhiteList | undefined; @@ -31,7 +31,7 @@ const onTagAttr = ( const renderMarkdown = ( content: string, - markedOptions: marked.MarkedOptions, + markedOptions: MarkedOptions, hassOptions: { // Do not allow SVG on untrusted content, it allows XSS. allowSvg?: boolean; diff --git a/yarn.lock b/yarn.lock index f7576a4a2c..9048dfada5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4412,13 +4412,6 @@ __metadata: languageName: node linkType: hard -"@types/marked@npm:4.3.1": - version: 4.3.1 - resolution: "@types/marked@npm:4.3.1" - checksum: eb6891b925d53ea53057f088b28f9232016499e62639cbb4a67f7d34f288ec6a8e40aae4836dbd06bd0fc3c541fca1175cd50d9e8d405547b6be7b7781e6a2a5 - languageName: node - linkType: hard - "@types/mime@npm:*": version: 3.0.1 resolution: "@types/mime@npm:3.0.1" @@ -9701,7 +9694,6 @@ __metadata: "@types/leaflet": 1.9.3 "@types/leaflet-draw": 1.0.7 "@types/luxon": 3.3.1 - "@types/marked": 4.3.1 "@types/mocha": 10.0.1 "@types/qrcode": 1.5.1 "@types/serve-handler": 6.1.1 @@ -9774,7 +9766,7 @@ __metadata: luxon: 3.4.0 magic-string: 0.30.2 map-stream: 0.0.7 - marked: 4.3.0 + marked: 7.0.2 memoize-one: 6.0.0 mocha: 10.2.0 node-vibrant: 3.2.1-alpha.1 @@ -11753,12 +11745,12 @@ __metadata: languageName: node linkType: hard -"marked@npm:4.3.0": - version: 4.3.0 - resolution: "marked@npm:4.3.0" +"marked@npm:7.0.2": + version: 7.0.2 + resolution: "marked@npm:7.0.2" bin: marked: bin/marked.js - checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260 + checksum: dabfd499c4852d671b73fbd10081a93349f74e4141a29697be99d33327e9aacd30e794bcc771a397ceb8060e5205e2f82862e1623c333802a3be0594134ba6c7 languageName: node linkType: hard