From eae92c2e029cf1e23b892824fc084ab968a0ddb2 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Wed, 8 Nov 2023 12:32:11 +0100 Subject: [PATCH] rename sanitizehtml to dompurify --- .../src/external/{sanitize-html => dompurify}/index.ts | 4 +--- .../input-markdown-editor/input-markdown.element.ts | 4 ++-- src/Umbraco.Web.UI.Client/tsconfig.json | 2 +- src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) rename src/Umbraco.Web.UI.Client/src/external/{sanitize-html => dompurify}/index.ts (59%) diff --git a/src/Umbraco.Web.UI.Client/src/external/sanitize-html/index.ts b/src/Umbraco.Web.UI.Client/src/external/dompurify/index.ts similarity index 59% rename from src/Umbraco.Web.UI.Client/src/external/sanitize-html/index.ts rename to src/Umbraco.Web.UI.Client/src/external/dompurify/index.ts index c05512948b..2a816a45c3 100644 --- a/src/Umbraco.Web.UI.Client/src/external/sanitize-html/index.ts +++ b/src/Umbraco.Web.UI.Client/src/external/dompurify/index.ts @@ -1,6 +1,4 @@ /* eslint local-rules/enforce-umbraco-external-imports: 0 */ import DOMPurify from 'dompurify'; -const sanitizeHtml = DOMPurify.sanitize; - -export { sanitizeHtml }; +export { DOMPurify }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts index 4a176dcffa..cb50430223 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts @@ -1,4 +1,4 @@ -import { sanitizeHtml } from '@umbraco-cms/backoffice/external/sanitize-html'; +import { DOMPurify } from '@umbraco-cms/backoffice/external/dompurify'; import { marked } from '@umbraco-cms/backoffice/external/marked'; import { monaco } from '@umbraco-cms/backoffice/external/monaco-editor'; import { UmbCodeEditorController, UmbCodeEditorElement, loadCodeEditor } from '@umbraco-cms/backoffice/code-editor'; @@ -548,7 +548,7 @@ export class UmbInputMarkdownElement extends FormControlMixin(UmbLitElement) { renderPreview(markdown: string) { const markdownAsHtml = marked.parse(markdown); - const sanitizedHtml = markdownAsHtml ? sanitizeHtml(markdownAsHtml) : ''; + const sanitizedHtml = markdownAsHtml ? DOMPurify.sanitize(markdownAsHtml) : ''; return html` ${unsafeHTML(sanitizedHtml)} `; } diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 2dc002fed3..2d036fc825 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -32,7 +32,7 @@ "@umbraco-cms/backoffice/external/tinymce": ["src/external/tinymce"], "@umbraco-cms/backoffice/external/uui": ["src/external/uui"], "@umbraco-cms/backoffice/external/uuid": ["src/external/uuid"], - "@umbraco-cms/backoffice/external/sanitize-html": ["src/external/sanitize-html"], + "@umbraco-cms/backoffice/external/dompurify": ["src/external/dompurify"], "@umbraco-cms/backoffice/external/marked": ["src/external/marked"], "@umbraco-cms/backoffice/backend-api": ["src/external/backend-api"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 6495958a88..53d2347db4 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -35,7 +35,7 @@ export default { '@umbraco-cms/backoffice/external/tinymce': './src/external/tinymce/index.ts', '@umbraco-cms/backoffice/external/uui': './src/external/uui/index.ts', '@umbraco-cms/backoffice/external/uuid': './src/external/uuid/index.ts', - '@umbraco-cms/backoffice/external/sanitize-html': './src/external/sanitize-html/index.ts', + '@umbraco-cms/backoffice/external/dompurify': './src/external/dompurify/index.ts', '@umbraco-cms/backoffice/external/marked': './src/external/marked/index.ts', '@umbraco-cms/backoffice/backend-api': './src/external/backend-api/index.ts',