Skip to content

Commit

Permalink
feat: upgrade html-validator to v8 version
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe committed Jun 30, 2023
1 parent 4e51575 commit 6c696b1
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 65 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@nuxt/kit": "^3.6.1",
"chalk": "^5.1.2",
"html-validate": "~7.18.0",
"html-validate": "~8.0.5",
"pathe": "^1.0.0",
"prettier": "^2.7.1",
"std-env": "^3.3.1"
Expand Down
71 changes: 13 additions & 58 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion src/runtime/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const useChecker = (

// Clean up Vue scoped style attributes
html = typeof html === 'string' ? html.replace(/ ?data-v-[-A-Za-z0-9]+(=["']([-A-Za-z0-9]|\/|:|\.)*["'])?/g, '') : html
const { valid, results } = validator.validateString(html)
const { valid, results } = await validator.validateString(html)

if (valid && !results.length) {
if (logLevel === 'verbose') {
Expand Down
10 changes: 5 additions & 5 deletions test/validator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ describe('useValidator', () => {
expect(validator4).toEqual(validator5)
})

it('returns a valid htmlValidate instance', () => {
it('returns a valid htmlValidate instance', async () => {
const validator = getValidator({ extends: ['html-validate:standard'] })

const { valid, results } = validator.validateString('<!DOCTYPE html><title>x</title>')
const { valid, results } = await validator.validateString('<!DOCTYPE html><title>x</title>')
expect(valid).toBeTruthy()
expect(results).toEqual([])

const { valid: invalid, results: invalidResults } = validator.validateString('<!DOCTYPE html><title>x</title><body><a><a>Test</a></a></body>')
const { valid: invalid, results: invalidResults } = await validator.validateString('<!DOCTYPE html><title>x</title><body><a><a>Test</a></a></body>')
expect(invalid).toBeFalsy()
expect(invalidResults).toMatchSnapshot()
})

it('works with default config', () => {
it('works with default config', async () => {
const validator = getValidator(defaultHtmlValidateConfig)
const { valid, results } = validator.validateString('<!DOCTYPE html><title>x</title>')
const { valid, results } = await validator.validateString('<!DOCTYPE html><title>x</title>')
expect(valid).toBeTruthy()
expect(results).toEqual([])
})
Expand Down

0 comments on commit 6c696b1

Please sign in to comment.