Skip to content

Commit d6e2be8

Browse files
committed
chore: upgrade to html-validate@5
1 parent 1cc96b7 commit d6e2be8

File tree

4 files changed

+491
-706
lines changed

4 files changed

+491
-706
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"dependencies": {
3131
"defu": "5.0.0",
32-
"html-validate": "4.14.0"
32+
"html-validate": "5.0.2"
3333
},
3434
"devDependencies": {
3535
"@babel/plugin-transform-runtime": "7.14.5",
@@ -41,12 +41,12 @@
4141
"@release-it/conventional-changelog": "3.0.1",
4242
"@types/jest": "26.0.23",
4343
"babel-eslint": "latest",
44-
"babel-jest": "27.0.5",
44+
"babel-jest": "27.0.6",
4545
"eslint": "7.29.0",
4646
"husky": "6.0.0",
47-
"jest": "27.0.5",
47+
"jest": "27.0.6",
4848
"lint-staged": "11.0.0",
49-
"nuxt-edge": "2.16.0-27063376.35c6ac41",
49+
"nuxt-edge": "2.16.0-27081523.eb6bd9fe",
5050
"release-it": "14.10.0",
5151
"siroc": "0.11.1"
5252
},

src/validator.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import chalk from 'chalk'
22
import consola from 'consola'
3-
import { ConfigData, HtmlValidate } from 'html-validate'
3+
import { ConfigData, HtmlValidate, formatterFactory } from 'html-validate'
44

55
const validators = new Map<ConfigData, HtmlValidate>()
66

@@ -46,11 +46,9 @@ export const useChecker = (
4646
)
4747
}
4848

49-
const formatter = couldFormat
50-
? await import('html-validate/dist/formatters/codeframe').then(r => r.default || /* istanbul ignore next */ r)
51-
: await import('html-validate/dist/formatters/stylish').then(r => r.default || /* istanbul ignore next */ r)
49+
const formatter = couldFormat ? formatterFactory('codeframe') : formatterFactory('stylish')
5250

53-
const formattedResult = formatter(results)
51+
const formattedResult = formatter!(results)
5452

5553
reporter.error(
5654
[

test/checker.test.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import consola from 'consola'
22
import prettier from 'prettier'
3-
import prettierPrinter from 'html-validate/dist/formatters/codeframe'
4-
import normalPrinter from 'html-validate/dist/formatters/stylish'
3+
import * as validate from 'html-validate'
54

65
import { useChecker } from '../src/validator'
76

@@ -16,8 +15,7 @@ jest.mock('prettier', () => ({
1615
jest.mock('consola', () => ({
1716
withTag: jest.fn().mockImplementation(() => mockReporter)
1817
}))
19-
jest.mock('html-validate/dist/formatters/codeframe')
20-
jest.mock('html-validate/dist/formatters/stylish')
18+
jest.spyOn(validate, 'formatterFactory')
2119

2220
const mockReporter = {
2321
success: jest.fn(),
@@ -76,7 +74,7 @@ describe('useChecker', () => {
7674

7775
await checker('https://test.com/', '<a>Link</a>')
7876
expect(prettier.format).toHaveBeenCalledWith('<a>Link</a>', { parser: 'html' })
79-
expect(prettierPrinter).toHaveBeenCalled()
77+
expect(validate.formatterFactory).toHaveBeenCalledWith('codeframe')
8078
})
8179

8280
it('falls back gracefully when prettier cannot format', async () => {
@@ -86,7 +84,7 @@ describe('useChecker', () => {
8684
await checker('https://test.com/', Symbol as any)
8785
expect(prettier.format).toHaveBeenCalledWith(Symbol, { parser: 'html' })
8886
expect(mockReporter.error).toHaveBeenCalled()
89-
expect(normalPrinter).toHaveBeenCalled()
90-
expect(prettierPrinter).not.toHaveBeenCalled()
87+
expect(validate.formatterFactory).toHaveBeenCalledWith('stylish')
88+
expect(validate.formatterFactory).not.toHaveBeenCalledWith('codeframe')
9189
})
9290
})

0 commit comments

Comments
 (0)