diff --git a/package.json b/package.json
index 689154ca..9ffbd509 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"any-size": "^1.0.0",
"btoa": "^1.2.1",
"ejs": "^3.0.1",
- "escape-html": "^1.0.3",
+ "escape-goat": "^3.0.0",
"express": "^4.17.1",
"express-minify": "^1.0.0",
"fs-extra": "^8.1.0",
@@ -39,7 +39,6 @@
"postcss-preset-env": "^6.7.0",
"serve-favicon": "^2.5.0",
"temp-dir": "^2.0.0",
- "unescape-html": "^1.1.0",
"yn": "^4.0.0"
},
"devDependencies": {
diff --git a/routes/get.js b/routes/get.js
index 7193ceb8..a55e96d4 100644
--- a/routes/get.js
+++ b/routes/get.js
@@ -1,8 +1,7 @@
const md5 = require('md5')
const path = require('path')
-const escapeTags = require('escape-html')
-const unescapeTags = require('unescape-html')
-const stripTags = require('html-text')
+const { htmlEscape, htmlUnescape } = require('escape-goat')
+const stripHtml = require('html-text')
const is = require('@sindresorhus/is')
function getCopyrightHTML (user, plain) {
@@ -12,17 +11,17 @@ function getCopyrightHTML (user, plain) {
? user
: plain
? user.name || user.copyright
- : escapeTags(user.name || user.copyright)
+ : htmlEscape(user.name || user.copyright)
if (user.url) {
- html = `${name}`
+ html = `${name}`
} else {
html = name
}
if (user.email) {
- html += ` <${
- plain ? user.email : escapeTags(user.email)
+ html += ` <${
+ plain ? user.email : htmlEscape(user.email)
}>`
}
@@ -41,7 +40,7 @@ module.exports = (req, res) => {
} else if (is.array(user.copyright) && user.copyright.every(val => is.string(val))) {
// Supports: ['Remy Sharp', 'Richie Bendall']
name = user.copyright
- .map(v => (options.format !== 'html' ? v : escapeTags(v)))
+ .map(v => (options.format !== 'html' ? v : htmlEscape(v)))
.join(', ')
} else {
name = user.copyright.map(getCopyrightHTML).join(', ')
@@ -84,7 +83,7 @@ module.exports = (req, res) => {
res
.set('Content-Type', 'text/plain; charset=UTF-8')
- .send(unescapeTags(stripTags(plain)).trim())
+ .send(htmlUnescape(stripHtml(plain)).trim())
return
}
diff --git a/yarn.lock b/yarn.lock
index 9774c241..c5371bd7 100644
Binary files a/yarn.lock and b/yarn.lock differ