Skip to content

Commit 4ef7cee

Browse files
authored
Merge pull request element-hq#17231 from vector-im/jryans/sanitize-upgrade
Switch back to release version of `sanitize-html`
2 parents 10d5855 + 4acde37 commit 4ef7cee

File tree

2 files changed

+8
-42
lines changed

2 files changed

+8
-42
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"prop-types": "^15.7.2",
6666
"react": "^16.14.0",
6767
"react-dom": "^16.14.0",
68-
"sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
68+
"sanitize-html": "^2.3.2",
6969
"ua-parser-js": "^0.7.24"
7070
},
7171
"devDependencies": {
@@ -92,7 +92,7 @@
9292
"@types/node": "^14.14.22",
9393
"@types/react": "^16.9",
9494
"@types/react-dom": "^16.9.10",
95-
"@types/sanitize-html": "^1.27.1",
95+
"@types/sanitize-html": "^2.3.1",
9696
"autoprefixer": "^9.8.6",
9797
"babel-eslint": "^10.1.0",
9898
"babel-jest": "^26.6.3",

yarn.lock

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,12 +1561,12 @@
15611561
"@types/prop-types" "*"
15621562
csstype "^3.0.2"
15631563

1564-
"@types/sanitize-html@^1.27.1":
1565-
version "1.27.1"
1566-
resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.1.tgz#1fc4b67edd6296eeb366960d13cd01f5d6bffdcd"
1567-
integrity sha512-TW5gfZYplKQYO8003WrxaDgwyJsEG74920S+Ei7zB9mbUFgm7l2NvFAumXzxL+1fOwM2I9A+G/1rgiEebQOxcQ==
1564+
"@types/sanitize-html@^2.3.1":
1565+
version "2.3.1"
1566+
resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.3.1.tgz#094d696b83b7394b016e96342bbffa6a028795ce"
1567+
integrity sha512-+UT/XRluJuCunRftwO6OzG6WOBgJ+J3sROIoSJWX+7PB2FtTJTEJLrHCcNwzCQc0r60bej3WAbaigK+VZtZCGw==
15681568
dependencies:
1569-
htmlparser2 "^4.1.0"
1569+
htmlparser2 "^6.0.0"
15701570

15711571
"@types/source-list-map@*":
15721572
version "0.1.2"
@@ -4051,13 +4051,6 @@ domhandler@^2.3.0:
40514051
dependencies:
40524052
domelementtype "1"
40534053

4054-
domhandler@^3.0.0:
4055-
version "3.3.0"
4056-
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
4057-
integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
4058-
dependencies:
4059-
domelementtype "^2.0.1"
4060-
40614054
domhandler@^4.0.0:
40624055
version "4.0.0"
40634056
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
@@ -4073,7 +4066,7 @@ domutils@^1.5.1, domutils@^1.7.0:
40734066
dom-serializer "0"
40744067
domelementtype "1"
40754068

4076-
domutils@^2.0.0, domutils@^2.4.3, domutils@^2.4.4:
4069+
domutils@^2.4.3, domutils@^2.4.4:
40774070
version "2.4.4"
40784071
resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
40794072
integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
@@ -5848,16 +5841,6 @@ htmlparser2@^3.10.0, htmlparser2@^3.10.1:
58485841
inherits "^2.0.1"
58495842
readable-stream "^3.1.1"
58505843

5851-
htmlparser2@^4.1.0:
5852-
version "4.1.0"
5853-
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
5854-
integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==
5855-
dependencies:
5856-
domelementtype "^2.0.1"
5857-
domhandler "^3.0.0"
5858-
domutils "^2.0.0"
5859-
entities "^2.0.0"
5860-
58615844
htmlparser2@^6.0.0:
58625845
version "6.0.0"
58635846
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.0.tgz#c2da005030390908ca4c91e5629e418e0665ac01"
@@ -10711,18 +10694,6 @@ sanitize-html@^2.3.2:
1071110694
parse-srcset "^1.0.2"
1071210695
postcss "^8.0.2"
1071310696

10714-
"sanitize-html@github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db":
10715-
version "2.0.0-rc.3"
10716-
resolved "https://codeload.github.com/apostrophecms/sanitize-html/tar.gz/3c7f93f2058f696f5359e3e58d464161647226db"
10717-
dependencies:
10718-
deepmerge "^4.2.2"
10719-
escape-string-regexp "^4.0.0"
10720-
htmlparser2 "^4.1.0"
10721-
is-plain-object "^5.0.0"
10722-
klona "^2.0.3"
10723-
postcss "^8.0.2"
10724-
srcset "^3.0.0"
10725-
1072610697
sax@^1.2.4, sax@~1.2.4:
1072710698
version "1.2.4"
1072810699
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -11195,11 +11166,6 @@ sprintf-js@~1.0.2:
1119511166
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
1119611167
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
1119711168

11198-
srcset@^3.0.0:
11199-
version "3.0.0"
11200-
resolved "https://registry.yarnpkg.com/srcset/-/srcset-3.0.0.tgz#8afd8b971362dfc129ae9c1a99b3897301ce6441"
11201-
integrity sha512-D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ==
11202-
1120311169
sshpk@^1.7.0:
1120411170
version "1.16.1"
1120511171
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"

0 commit comments

Comments
 (0)