A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: escape html in note title in diff viewer (#9518)
01zulfieadd23de4d2a
diff --git a/apps/web/package-lock.json b/apps/web/package-lock.jsonindex af1bed819..c29c0e878 100644--- a/apps/web/package-lock.json+++ b/apps/web/package-lock.json@@ -54,6 +54,7 @@"dayjs": "1.11.13","diffblazer": "^1.0.1","electron-trpc": "0.7.1",+ "entities": "^7.0.1","event-source-polyfill": "1.0.31","fflate": "^0.8.0","file-saver": "^2.0.5",@@ -507,7 +508,7 @@},"../desktop": {"name": "@notesnook/desktop",- "version": "3.3.9-beta.2",+ "version": "3.3.10","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {@@ -2924,6 +2925,18 @@"zod": "^3.22.4"}},+ "node_modules/@notesnook-importer/core/node_modules/entities": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=0.12"+ },+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },"node_modules/@notesnook-importer/core/node_modules/fflate": {"version": "0.7.4","resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz",@@ -4163,6 +4176,19 @@"url": "https://github.com/sponsors/gregberge"}},+ "node_modules/@svgr/hast-util-to-babel-ast/node_modules/entities": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",+ "dev": true,+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=0.12"+ },+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },"node_modules/@svgr/plugin-jsx": {"version": "8.1.0","resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz",@@ -6687,6 +6713,18 @@"htmlparser2": "^9.0.0"}},+ "node_modules/diffblazer/node_modules/entities": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=0.12"+ },+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },"node_modules/diffblazer/node_modules/htmlparser2": {"version": "9.1.0","resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",@@ -6720,6 +6758,18 @@"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"}},+ "node_modules/dom-serializer/node_modules/entities": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=0.12"+ },+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },"node_modules/domelementtype": {"version": "2.3.0","resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",@@ -6920,9 +6970,9 @@}},"node_modules/entities": {- "version": "4.5.0",- "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",- "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",+ "version": "7.0.1",+ "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",+ "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==","license": "BSD-2-Clause","engines": {"node": ">=0.12"@@ -8265,6 +8315,18 @@"entities": "^4.4.0"}},+ "node_modules/htmlparser2/node_modules/entities": {+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=0.12"+ },+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },"node_modules/http-cache-semantics": {"version": "4.2.0","resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",diff --git a/apps/web/package.json b/apps/web/package.jsonindex 02da28fbe..239f9af3a 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -52,6 +52,7 @@"dayjs": "1.11.13","diffblazer": "^1.0.1","electron-trpc": "0.7.1",+ "entities": "^7.0.1","event-source-polyfill": "1.0.31","fflate": "^0.8.0","file-saver": "^2.0.5",diff --git a/apps/web/src/components/diff-viewer/index.tsx b/apps/web/src/components/diff-viewer/index.tsxindex 724e09722..765786778 100644--- a/apps/web/src/components/diff-viewer/index.tsx+++ b/apps/web/src/components/diff-viewer/index.tsx@@ -35,6 +35,7 @@ import { UnlockView } from "../unlock";import { getFormattedDate } from "@notesnook/common";import { diff } from "diffblazer";import { strings } from "@notesnook/intl";+import { escapeUTF8 } from "entities";type DiffViewerProps = { session: ConflictedEditorSession | DiffEditorSession };function DiffViewer(props: DiffViewerProps) {@@ -105,8 +106,11 @@ function DiffViewer(props: DiffViewerProps) {dangerouslySetInnerHTML={{__html:session.type === "diff" && session.oldTitle- ? diff(session.oldTitle || "", session.note.title)- : session.note.title+ ? diff(+ escapeUTF8(session.oldTitle || ""),+ escapeUTF8(session.note.title)+ )+ : escapeUTF8(session.note.title)}}></Text><Flex mt={1} sx={{ alignSelf: "center", justifySelf: "center" }}>