Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .rebase/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.

#### @sbouchet
https://github.com/che-incubator/che-code/pull/705

- code/extensions/markdown-language-features/package.json
- code/extensions/mermaid-chat-features/package.json
- code/src/vs/base/browser/dompurify/cgmanifest.json
- code/src/vs/base/browser/dompurify/dompurify.d.ts
- code/src/vs/base/browser/dompurify/dompurify.js
---

#### @sbouchet
https://github.com/che-incubator/che-code/pull/698

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"dompurify": "^3.4.2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"dompurify": "^3.4.2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"from": "\"commitHash\": \"eaa0bdb26a1d0164af587d9059b98269008faece\",",
"by": "\"commitHash\": \"6f67fd396a7b8c64294343999fe607ca1f5299c0\","
},
{
"from": "\"tag\": \"3.2.7\"",
"by": "\"tag\": \"3.4.2\""
},
{
"from": "\"version\": \"3.2.7\"",
"by": "\"version\": \"3.4.2\""
}
]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/markdown-language-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@
},
"dependencies": {
"@vscode/extension-telemetry": "^0.9.8",
"dompurify": "^3.2.7",
"dompurify": "^3.4.2",
"highlight.js": "^11.8.0",
"markdown-it": "^12.3.2",
"markdown-it-front-matter": "^0.2.4",
Expand Down
8 changes: 4 additions & 4 deletions code/extensions/mermaid-chat-features/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion code/extensions/mermaid-chat-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@types/node": "^22.18.10"
},
"dependencies": {
"dompurify": "^3.2.7",
"dompurify": "^3.4.2",
"mermaid": "^11.11.0"
}
}
6 changes: 3 additions & 3 deletions code/src/vs/base/browser/dompurify/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"git": {
"name": "dompurify",
"repositoryUrl": "https://github.com/cure53/DOMPurify",
"commitHash": "eaa0bdb26a1d0164af587d9059b98269008faece",
"tag": "3.2.7"
"commitHash": "6f67fd396a7b8c64294343999fe607ca1f5299c0",
"tag": "3.4.2"
}
},
"license": "Apache 2.0",
"version": "3.2.7"
"version": "3.4.2"
}
],
"version": 1
Expand Down
16 changes: 12 additions & 4 deletions code/src/vs/base/browser/dompurify/dompurify.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! @license DOMPurify 3.2.7 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.7/LICENSE */
/*! @license DOMPurify 3.4.2 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.4.2/LICENSE */

import type { TrustedTypePolicy, TrustedHTML, TrustedTypesWindow } from 'trusted-types/lib/index.d.ts';

Expand All @@ -8,16 +8,20 @@ import type { TrustedTypePolicy, TrustedHTML, TrustedTypesWindow } from 'trusted
interface Config {
/**
* Extend the existing array of allowed attributes.
* Can be an array of attribute names, or a function that receives
* the attribute name and tag name to determine if the attribute is allowed.
*/
ADD_ATTR?: string[] | undefined;
ADD_ATTR?: string[] | ((attributeName: string, tagName: string) => boolean) | undefined;
/**
* Extend the existing array of elements that can use Data URIs.
*/
ADD_DATA_URI_TAGS?: string[] | undefined;
/**
* Extend the existing array of allowed tags.
* Can be an array of tag names, or a function that receives
* the tag name to determine if the tag is allowed.
*/
ADD_TAGS?: string[] | undefined;
ADD_TAGS?: string[] | ((tagName: string) => boolean) | undefined;
/**
* Extend the existing array of elements that are safe for URI-like values (be careful, XSS risk).
*/
Expand Down Expand Up @@ -90,6 +94,10 @@ interface Config {
* Add child elements to be removed when their parent is removed.
*/
FORBID_CONTENTS?: string[] | undefined;
/**
* Extend the existing or default array of forbidden content elements.
*/
ADD_FORBID_CONTENTS?: string[] | undefined;
/**
* Add elements to block-list.
*/
Expand Down Expand Up @@ -195,7 +203,7 @@ interface UseProfilesConfig {
*/
svg?: boolean | undefined;
/**
* Allow all save SVG Filters.
* Allow all safe SVG Filters.
*/
svgFilters?: boolean | undefined;
/**
Expand Down
Loading
Loading