TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

Updated html-validate to v8

Browse Source 
refs https://gitlab.com/html-validate/html-validate/blob/HEAD/CHANGELOG.md#800-2023-06-04

- includes one small change as per their breaking changes list
This commit is contained in:
Daniel Lockyer 2023-07-11 10:00:19 +02:00 committed by Daniel Lockyer
parent 4d3272e0c0
commit 8a4ccff942
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/email-service/package.json
View File

@ -19,7 +19,7 @@
], ],
"devDependencies": { "devDependencies": {
"c8": "7.13.0", "c8": "7.13.0",
"html-validate": "7.18.1", "html-validate": "8.0.5",
"mocha": "10.2.0", "mocha": "10.2.0",
"should": "13.2.3", "should": "13.2.3",
"sinon": "15.0.3" "sinon": "15.0.3"

6
ghost/email-service/test/email-renderer.test.js
View File

@ -7,7 +7,7 @@ const sinon = require('sinon');
const logging = require('@tryghost/logging'); const logging = require('@tryghost/logging');
const {HtmlValidate} = require('html-validate'); const {HtmlValidate} = require('html-validate');
function validateHtml(html) { async function validateHtml(html) {
const htmlvalidate = new HtmlValidate({ const htmlvalidate = new HtmlValidate({
extends: [ extends: [
'html-validate:document', 'html-validate:document',
@ -34,7 +34,7 @@ function validateHtml(html) {
} }
] ]
}); });
const report = htmlvalidate.validateString(html); const report = await htmlvalidate.validateString(html);
// Improve debugging and show a snippet of the invalid HTML instead of just the line number or a huge HTML-dump // Improve debugging and show a snippet of the invalid HTML instead of just the line number or a huge HTML-dump
const parsedErrors = []; const parsedErrors = [];
@ -1581,7 +1581,7 @@ describe('Email renderer', function () {
options options
); );
validateHtml(response.html); await validateHtml(response.html);
// Check footer content is not escaped // Check footer content is not escaped
assert.equal(response.html.includes('<span>Footer content with valid HTML</span>'), true, 'Should include footer content without escaping'); assert.equal(response.html.includes('<span>Footer content with valid HTML</span>'), true, 'Should include footer content without escaping');

18
yarn.lock
View File

@ -3241,7 +3241,7 @@
ember-compatibility-helpers "^1.2.1" ember-compatibility-helpers "^1.2.1"
ember-raf-scheduler "^0.3.0" ember-raf-scheduler "^0.3.0"
"@html-validate/stylish@^4.0.1": "@html-validate/stylish@^4.1.0":
version "4.1.0" version "4.1.0"
resolved "https://registry.yarnpkg.com/@html-validate/stylish/-/stylish-4.1.0.tgz#2683b64c3e845e413c86912c6239f7168e8fb941" resolved "https://registry.yarnpkg.com/@html-validate/stylish/-/stylish-4.1.0.tgz#2683b64c3e845e413c86912c6239f7168e8fb941"
integrity sha512-f2MOKJ2HVdLxpOOg2jD6hjDTDJic3wpb8/UdDDIic5jTvgfMMPN3PoiNWlqDg/mCzLIj1b/p1hCRx4Kz5lbVjw== integrity sha512-f2MOKJ2HVdLxpOOg2jD6hjDTDJic3wpb8/UdDDIic5jTvgfMMPN3PoiNWlqDg/mCzLIj1b/p1hCRx4Kz5lbVjw==
@ -8661,7 +8661,7 @@ acorn-walk@^7.1.1, acorn-walk@^7.2.0:
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0: acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0:
version "8.2.0" version "8.2.0"
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@ -16894,7 +16894,7 @@ espree@^7.3.0, espree@^7.3.1:
acorn-jsx "^5.3.1" acorn-jsx "^5.3.1"
eslint-visitor-keys "^1.3.0" eslint-visitor-keys "^1.3.0"
espree@^9.0.0, espree@^9.5.1, espree@^9.5.2: espree@^9.5.1, espree@^9.5.2:
version "9.5.2" version "9.5.2"
resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
@ -19320,18 +19320,16 @@ html-to-text@8.2.1:
minimist "^1.2.6" minimist "^1.2.6"
selderee "^0.6.0" selderee "^0.6.0"
html-validate@7.18.1: html-validate@8.0.5:
version "7.18.1" version "8.0.5"
resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-7.18.1.tgz#179dcb102e9738365c5ea2bcebf437bfb065a39f" resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-8.0.5.tgz#f28432aa254acf5dc98c1c82b8c9a3bea0440da9"
integrity sha512-K5jb0h/xAoeR8sJqyR0n/QaKL7rdT88sPCtN+Pvtyn5JUU+nidQe2gBB09WRzPTcQtPXBj4QxBUH5IA2tt8JQg== integrity sha512-8IBayugyDTiH49JjxSEq+A0UFQzuyG9m0382aHMrPoHVNQcr3IypjuKcjn150ahAwAqO0o4NgMbkC1LezQU1mw==
dependencies: dependencies:
"@babel/code-frame" "^7.10.0" "@babel/code-frame" "^7.10.0"
"@html-validate/stylish" "^4.0.1" "@html-validate/stylish" "^4.1.0"
"@sidvind/better-ajv-errors" "^2.0.0" "@sidvind/better-ajv-errors" "^2.0.0"
acorn-walk "^8.0.0"
ajv "^8.0.0" ajv "^8.0.0"
deepmerge "^4.2.0" deepmerge "^4.2.0"
espree "^9.0.0"
glob "^10.0.0" glob "^10.0.0"
ignore "^5.0.0" ignore "^5.0.0"
kleur "^4.1.0" kleur "^4.1.0"