TagSpaces is an offline, open source, document manager with tagging support
chore: updating the marked and electron deps
Ilian Sapundshiev42053d6b4f73
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsxindex 12772bdb7..a95154fc4 100644--- a/app/components/EntryProperties.tsx+++ b/app/components/EntryProperties.tsx@@ -19,7 +19,8 @@import React, { ChangeEvent, useEffect, useRef, useState } from 'react';import { useStateWithCallbackLazy } from 'use-state-with-callback';import { v1 as uuidv1 } from 'uuid';-import marked from 'marked';+// @ts-ignore+import { marked } from 'marked';import L from 'leaflet';import classNames from 'classnames';import { withStyles } from '@material-ui/core/styles';@@ -649,7 +650,7 @@ const EntryProperties = (props: Props) => {}const sanitizedDescription = currentEntry.description- ? marked(DOMPurify.sanitize(currentEntry.description))+ ? marked.parse(DOMPurify.sanitize(currentEntry.description)): i18n.t('core:addMarkdownDescription');// @ts-ignorediff --git a/app/services/utils-io.ts b/app/services/utils-io.tsindex 1cdb246cc..52c949fe3 100644--- a/app/services/utils-io.ts+++ b/app/services/utils-io.ts@@ -17,7 +17,8 @@*/import { v1 as uuidv1 } from 'uuid';-import marked from 'marked';+// @ts-ignore+import { marked } from 'marked';import DOMPurify from 'dompurify';import {loadIndex,@@ -1140,7 +1141,7 @@ export function loadFileContentPromise(export function removeMarkDown(mdContent) {if (!mdContent) return '';- let result = marked(DOMPurify.sanitize(mdContent));+ let result = marked.parse(DOMPurify.sanitize(mdContent));const span = document.createElement('span');span.innerHTML = result;result = span.textContent || span.innerText;diff --git a/package.json b/package.jsonindex 69aca779b..fae0f1e8c 100644--- a/package.json+++ b/package.json@@ -132,8 +132,8 @@"test-watch": "yarn test --watch","third-party": "yarn licenses generate-disclaimer --silent > app/third-party.txt","type-check": "tsc --noEmit",- "update-changelog": "git log v4.1.2..HEAD --no-merges --format=%B > CHANGELOG.TXT",- "update-changelog-pro": "cd extensions/tagspacespro && git log v4.1.2..HEAD --no-merges --format=%B > ../../CHANGELOG-PRO.TXT",+ "update-changelog": "git log v4.1.3..HEAD --no-merges --format=%B > CHANGELOG.TXT",+ "update-changelog-pro": "cd extensions/tagspacespro && git log v4.1.3..HEAD --no-merges --format=%B > ../../CHANGELOG-PRO.TXT","update-i18n": "tx pull -a -d","version-meta": "node scripts/versionmeta.js","linux-fix-sandbox": "sudo chown root:root node_modules/electron/dist/chrome-sandbox && sudo chmod 4755 node_modules/electron/dist/chrome-sandbox",@@ -176,7 +176,7 @@"i18next-http-backend": "^1.2.8","jszip": "^3.7.1","leaflet": "^1.7.1",- "marked": "^3.0.8",+ "marked": "^4.0.12","material-design-icons": "^3.0.1","mgrs": "^1.0.0","open-location-code": "^1.0.3",@@ -274,7 +274,7 @@"current-git-branch": "^1.1.0","detect-port": "^1.3.0","devtron": "^1.4.0",- "electron": "16.0.1",+ "electron": "16.0.8","electron-builder": "^22.14.7","electron-devtools-installer": "^3.2.0","enzyme": "^2.8.2",diff --git a/yarn.lock b/yarn.lockindex f9886e2d2..cdcf21d13 100644--- a/yarn.lock+++ b/yarn.lock@@ -9077,10 +9077,10 @@ electron-window-state@^5.0.3:jsonfile "^4.0.0"mkdirp "^0.5.1"- version "16.0.1"- resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.1.tgz#34c0946bd6b6fa8de5181338a04cb690611f140c"- integrity sha512-6TSDBcoKGgmKL/+W+LyaXidRVeRl1V4I81ZOWcqsVksdTMfM4AlxTgfaoYdK/nUhqBrUtuPDcqOyJE6Bc4qMpw==+ version "16.0.8"+ resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.8.tgz#7ebd3e23c4883c239f53d8b7af1100f455ac8a02"+ integrity sha512-znTVkl8LaGcPNdfc6SRr+6LYg2GtSCKXln/nW/PC+urBfAFnOYIuDock8QyGVFfzr5PuAa+g8YQQAboHV77D7g==dependencies:"@electron/get" "^1.13.0""@types/node" "^14.6.2"@@ -14129,10 +14129,10 @@ markdown-table@^2.0.0:dependencies:repeat-string "^1.0.0"-marked@^3.0.8:- version "3.0.8"- resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz#2785f0dc79cbdc6034be4bb4f0f0a396bd3f8aeb"- integrity sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==+marked@^4.0.12:+ version "4.0.12"+ resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d"+ integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==matcher@^1.0.0:version "1.1.1"