mirror of
https://github.com/theoludwig/html-w3c-validator.git
synced 2025-05-21 23:21:29 +02:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
3d24ffe971 | |||
e818556c5b | |||
2cb7967bc7 | |||
943b3d1fd6 | |||
6ca7722fcf | |||
3a44eca5b1 |
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,6 +1,6 @@
|
||||
<!-- Please first discuss the change you wish to make via issue before making a change. It might avoid a waste of your time. -->
|
||||
|
||||
## What changes this PR introduce?
|
||||
# What changes this PR introduce?
|
||||
|
||||
## List any relevant issue numbers
|
||||
|
||||
|
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
@ -10,16 +10,18 @@ jobs:
|
||||
build:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.0.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.1.0'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: 'lts/*'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'Build'
|
||||
run: 'npm run build'
|
||||
|
||||
- run: 'npm run build:typescript'
|
||||
|
12
.github/workflows/lint.yml
vendored
12
.github/workflows/lint.yml
vendored
@ -10,19 +10,19 @@ jobs:
|
||||
lint:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.0.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.1.0'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: 'lts/*'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- run: 'npm run lint:commit -- --to "${{ github.sha }}"'
|
||||
- run: 'npm run lint:editorconfig'
|
||||
- run: 'npm run lint:markdown'
|
||||
- run: 'npm run lint:typescript'
|
||||
- run: 'npm run lint:eslint'
|
||||
- run: 'npm run lint:prettier'
|
||||
|
20
.github/workflows/release.yml
vendored
20
.github/workflows/release.yml
vendored
@ -7,24 +7,34 @@ on:
|
||||
jobs:
|
||||
release:
|
||||
runs-on: 'ubuntu-latest'
|
||||
permissions:
|
||||
contents: 'write'
|
||||
issues: 'write'
|
||||
pull-requests: 'write'
|
||||
id-token: 'write'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.0.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: false
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.1.0'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: 'lts/*'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'Build'
|
||||
run: 'npm run build'
|
||||
|
||||
- run: 'npm run build:typescript'
|
||||
|
||||
- name: 'Verify the integrity of provenance attestations and registry signatures for installed dependencies'
|
||||
run: 'npm audit signatures'
|
||||
|
||||
- name: 'Release'
|
||||
run: 'npm run release'
|
||||
env:
|
||||
|
10
.github/workflows/test.yml
vendored
10
.github/workflows/test.yml
vendored
@ -10,16 +10,16 @@ jobs:
|
||||
test:
|
||||
runs-on: 'ubuntu-latest'
|
||||
steps:
|
||||
- uses: 'actions/checkout@v3.0.0'
|
||||
- uses: 'actions/checkout@v3.5.2'
|
||||
|
||||
- name: 'Use Node.js'
|
||||
uses: 'actions/setup-node@v3.1.0'
|
||||
- name: 'Setup Node.js'
|
||||
uses: 'actions/setup-node@v3.6.0'
|
||||
with:
|
||||
node-version: 'lts/*'
|
||||
cache: 'npm'
|
||||
|
||||
- name: 'Install'
|
||||
run: 'npm install'
|
||||
- name: 'Install dependencies'
|
||||
run: 'npm clean-install'
|
||||
|
||||
- name: 'Build'
|
||||
run: 'npm run build'
|
||||
|
@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
. "$(dirname "$0")/_/husky.sh"
|
||||
|
||||
npm run lint:commit -- --edit
|
@ -1,5 +0,0 @@
|
||||
#!/bin/sh
|
||||
. "$(dirname "$0")/_/husky.sh"
|
||||
|
||||
npm run lint:staged
|
||||
npm run build
|
11
.markdownlint-cli2.jsonc
Normal file
11
.markdownlint-cli2.jsonc
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
"config": {
|
||||
"extends": "markdownlint/style/prettier",
|
||||
"relative-links": true,
|
||||
"default": true,
|
||||
"MD033": false
|
||||
},
|
||||
"globs": ["**/*.{md,mdx}"],
|
||||
"ignores": ["**/node_modules"],
|
||||
"customRules": ["markdownlint-rule-relative-links"]
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
{
|
||||
"default": true,
|
||||
"MD013": false,
|
||||
"MD033": false,
|
||||
"MD041": false
|
||||
}
|
3
.vscode/extensions.json
vendored
3
.vscode/extensions.json
vendored
@ -3,7 +3,6 @@
|
||||
"editorconfig.editorconfig",
|
||||
"esbenp.prettier-vscode",
|
||||
"dbaeumer.vscode-eslint",
|
||||
"davidanson.vscode-markdownlint",
|
||||
"ms-azuretools.vscode-docker"
|
||||
"davidanson.vscode-markdownlint"
|
||||
]
|
||||
}
|
||||
|
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@ -6,5 +6,9 @@
|
||||
"editor.formatOnSave": true,
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll": true
|
||||
}
|
||||
},
|
||||
"eslint.options": {
|
||||
"ignorePath": ".gitignore"
|
||||
},
|
||||
"prettier.ignorePath": ".gitignore"
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ representative at an online or offline event.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported to the community leaders responsible for enforcement at
|
||||
contact@divlo.fr.
|
||||
<contact@divlo.fr>.
|
||||
All complaints will be reviewed and investigated promptly and fairly.
|
||||
|
||||
All community leaders are obligated to respect the privacy and security of the
|
||||
|
@ -2,6 +2,14 @@
|
||||
|
||||
Thanks a lot for your interest in contributing to **html-w3c-validator**! 🎉
|
||||
|
||||
## Code of Conduct
|
||||
|
||||
**html-w3c-validator** adopted the [Contributor Covenant](https://www.contributor-covenant.org/) as its Code of Conduct, and we expect project participants to adhere to it. Please read [the full text](./CODE_OF_CONDUCT.md) so that you can understand what actions will and will not be tolerated.
|
||||
|
||||
## Open Development
|
||||
|
||||
All work on **html-w3c-validator** happens directly on this repository. Both core team members and external contributors send pull requests which go through the same review process.
|
||||
|
||||
## Types of contributions
|
||||
|
||||
- Reporting a bug.
|
||||
@ -21,26 +29,4 @@ If you're adding new features to **html-w3c-validator**, please include tests.
|
||||
|
||||
## Commits
|
||||
|
||||
The commit message guidelines respect [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional) and [Semantic Versioning](https://semver.org/) for releases.
|
||||
|
||||
### Types
|
||||
|
||||
Types define which kind of changes you made to the project.
|
||||
|
||||
| Types | Description |
|
||||
| -------- | ------------------------------------------------------------------------------------------------------------ |
|
||||
| feat | A new feature. |
|
||||
| fix | A bug fix. |
|
||||
| docs | Documentation only changes. |
|
||||
| style | Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc). |
|
||||
| refactor | A code change that neither fixes a bug nor adds a feature. |
|
||||
| perf | A code change that improves performance. |
|
||||
| test | Adding missing tests or correcting existing tests. |
|
||||
| build | Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm). |
|
||||
| ci | Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs). |
|
||||
| chore | Other changes that don't modify src or test files. |
|
||||
| revert | Reverts a previous commit. |
|
||||
|
||||
### Scopes
|
||||
|
||||
Scopes define what part of the code changed.
|
||||
The commit message guidelines adheres to [Conventional Commits](https://www.conventionalcommits.org/) and [Semantic Versioning](https://semver.org/) for releases.
|
||||
|
@ -59,7 +59,7 @@ npm install --save-dev html-w3c-validator start-server-and-test
|
||||
"start": "serve \"./build\"",
|
||||
|
||||
// Command to validate your HTML pages
|
||||
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://localhost:3000\" \"html-w3c-validator\""
|
||||
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://127.0.0.1:3000\" \"html-w3c-validator\""
|
||||
}
|
||||
}
|
||||
```
|
||||
@ -68,7 +68,7 @@ npm install --save-dev html-w3c-validator start-server-and-test
|
||||
|
||||
```jsonc
|
||||
{
|
||||
"urls": ["http://localhost:3000/", "http://localhost:3000/about"],
|
||||
"urls": ["http://127.0.0.1:3000/", "http://127.0.0.1:3000/about"],
|
||||
|
||||
// You can also specify HTML files instead of URLs
|
||||
"files": ["./index.html", "./about.html"]
|
||||
@ -84,8 +84,8 @@ npm run test:html-w3c-validator
|
||||
Example of output (in case of success):
|
||||
|
||||
```txt
|
||||
✔ Validating http://localhost:3000/
|
||||
✔ Validating http://localhost:3000/about
|
||||
✔ Validating http://127.0.0.1:3000/
|
||||
✔ Validating http://127.0.0.1:3000/about
|
||||
|
||||
Success: HTML validation (W3C) passed! 🎉
|
||||
```
|
||||
|
@ -1,4 +1,4 @@
|
||||
{
|
||||
"urls": ["http://localhost:3000/", "http://localhost:3000/about"],
|
||||
"urls": ["http://127.0.0.1:3000/", "http://127.0.0.1:3000/about"],
|
||||
"files": ["./build/index.html", "./build/about.html"]
|
||||
}
|
||||
|
2260
example/package-lock.json
generated
2260
example/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -3,11 +3,11 @@
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "serve \"./build\"",
|
||||
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://localhost:3000\" \"html-w3c-validator\""
|
||||
"test:html-w3c-validator": "start-server-and-test \"start\" \"http://127.0.0.1:3000\" \"html-w3c-validator\""
|
||||
},
|
||||
"devDependencies": {
|
||||
"serve": "13.0.2",
|
||||
"start-server-and-test": "1.14.0",
|
||||
"serve": "14.2.0",
|
||||
"start-server-and-test": "2.0.0",
|
||||
"html-w3c-validator": "file:.."
|
||||
}
|
||||
}
|
||||
|
20048
package-lock.json
generated
20048
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
93
package.json
93
package.json
@ -22,64 +22,67 @@
|
||||
],
|
||||
"main": "build/index.js",
|
||||
"bin": "build/index.js",
|
||||
"engines": {
|
||||
"node": ">=16.0.0",
|
||||
"npm": ">=8.0.0"
|
||||
},
|
||||
"files": [
|
||||
"build"
|
||||
],
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16.0.0",
|
||||
"npm": ">=9.0.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rimraf ./build && swc ./src --out-dir ./build && tsc",
|
||||
"build": "rimraf ./build && swc ./src --out-dir ./build",
|
||||
"build:typescript": "tsc",
|
||||
"lint:commit": "commitlint",
|
||||
"lint:editorconfig": "editorconfig-checker",
|
||||
"lint:markdown": "markdownlint \"**/*.md\" --dot --ignore-path \".gitignore\"",
|
||||
"lint:typescript": "eslint \"**/*.{js,jsx,ts,tsx}\" --ignore-path \".gitignore\"",
|
||||
"lint:markdown": "markdownlint-cli2",
|
||||
"lint:eslint": "eslint \".\" --ignore-path \".gitignore\"",
|
||||
"lint:prettier": "prettier \".\" --check --ignore-path \".gitignore\"",
|
||||
"lint:staged": "lint-staged",
|
||||
"test": "tap",
|
||||
"release": "semantic-release",
|
||||
"postinstall": "husky install",
|
||||
"prepublishOnly": "pinst --disable",
|
||||
"postpublish": "pinst --enable"
|
||||
"release": "semantic-release"
|
||||
},
|
||||
"dependencies": {
|
||||
"chalk": "5.0.1",
|
||||
"clipanion": "3.1.0",
|
||||
"html-validator": "6.0.0",
|
||||
"ora": "6.1.0",
|
||||
"read-pkg": "7.1.0",
|
||||
"table": "6.8.0"
|
||||
"chalk": "5.2.0",
|
||||
"clipanion": "3.2.0",
|
||||
"html-validator": "6.0.1",
|
||||
"log-symbols": "5.1.0",
|
||||
"ora": "6.3.0",
|
||||
"read-pkg": "8.0.0",
|
||||
"table": "6.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "16.2.3",
|
||||
"@commitlint/config-conventional": "16.2.1",
|
||||
"@swc/cli": "0.1.57",
|
||||
"@swc/core": "1.2.163",
|
||||
"@types/html-validator": "5.0.2",
|
||||
"@commitlint/cli": "17.6.3",
|
||||
"@commitlint/config-conventional": "17.6.3",
|
||||
"@swc/cli": "0.1.62",
|
||||
"@swc/core": "1.3.57",
|
||||
"@tsconfig/strictest": "2.0.1",
|
||||
"@types/html-validator": "5.0.3",
|
||||
"@types/mock-fs": "4.13.1",
|
||||
"@types/node": "17.0.23",
|
||||
"@types/tap": "15.0.6",
|
||||
"@typescript-eslint/eslint-plugin": "5.18.0",
|
||||
"editorconfig-checker": "4.0.2",
|
||||
"eslint": "8.12.0",
|
||||
"eslint-config-conventions": "2.0.0",
|
||||
"eslint-config-prettier": "8.5.0",
|
||||
"eslint-plugin-import": "2.26.0",
|
||||
"eslint-plugin-prettier": "4.0.0",
|
||||
"eslint-plugin-promise": "6.0.0",
|
||||
"eslint-plugin-unicorn": "42.0.0",
|
||||
"execa": "6.1.0",
|
||||
"husky": "7.0.4",
|
||||
"lint-staged": "12.3.7",
|
||||
"markdownlint-cli": "0.31.1",
|
||||
"mock-fs": "5.1.2",
|
||||
"pinst": "3.0.0",
|
||||
"prettier": "2.6.2",
|
||||
"rimraf": "3.0.2",
|
||||
"semantic-release": "19.0.2",
|
||||
"serve": "13.0.2",
|
||||
"tap": "16.0.1",
|
||||
"typescript": "4.6.3"
|
||||
"@types/node": "20.1.3",
|
||||
"@types/tap": "15.0.8",
|
||||
"@typescript-eslint/eslint-plugin": "5.59.5",
|
||||
"editorconfig-checker": "5.0.1",
|
||||
"eslint": "8.40.0",
|
||||
"eslint-config-conventions": "9.0.0",
|
||||
"eslint-config-prettier": "8.8.0",
|
||||
"eslint-plugin-import": "2.27.5",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"eslint-plugin-promise": "6.1.1",
|
||||
"eslint-plugin-unicorn": "47.0.0",
|
||||
"execa": "7.1.1",
|
||||
"lint-staged": "13.2.2",
|
||||
"markdownlint-cli2": "0.7.1",
|
||||
"markdownlint-rule-relative-links": "1.2.0",
|
||||
"mock-fs": "5.2.0",
|
||||
"prettier": "2.8.8",
|
||||
"rimraf": "5.0.0",
|
||||
"semantic-release": "21.0.2",
|
||||
"serve": "14.2.0",
|
||||
"tap": "16.3.4",
|
||||
"typescript": "5.0.4"
|
||||
}
|
||||
}
|
||||
|
@ -4,10 +4,12 @@ import fs from 'node:fs'
|
||||
import { Command } from 'clipanion'
|
||||
import chalk from 'chalk'
|
||||
import ora from 'ora'
|
||||
import validateHTML, {
|
||||
import logSymbols from 'log-symbols'
|
||||
import type {
|
||||
ValidationMessageLocationObject,
|
||||
ParsedJsonAsValidationResults
|
||||
} from 'html-validator'
|
||||
import validateHTML from 'html-validator'
|
||||
import { table } from 'table'
|
||||
|
||||
import { isExistingPath } from './utils/isExistingPath.js'
|
||||
@ -25,13 +27,28 @@ interface Error {
|
||||
messagesTable: string[][]
|
||||
}
|
||||
|
||||
interface Result {
|
||||
data: string
|
||||
isSuccess: boolean
|
||||
}
|
||||
|
||||
const printResults = (results: Result[]): void => {
|
||||
for (const result of results) {
|
||||
if (result.isSuccess) {
|
||||
console.log(logSymbols.success, result.data)
|
||||
} else {
|
||||
console.log(logSymbols.error, result.data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export class HTMLValidatorCommand extends Command {
|
||||
static usage = {
|
||||
static override usage = {
|
||||
description:
|
||||
'CLI for validating multiple html pages using <https://validator.w3.org/>.'
|
||||
}
|
||||
|
||||
async execute(): Promise<number> {
|
||||
public async execute(): Promise<number> {
|
||||
const configPath = path.join(CURRENT_DIRECTORY, CONFIG_FILE_NAME)
|
||||
try {
|
||||
if (!(await isExistingPath(configPath))) {
|
||||
@ -39,7 +56,6 @@ export class HTMLValidatorCommand extends Command {
|
||||
`No config file found at ${configPath}. Please create ${CONFIG_FILE_NAME}.`
|
||||
)
|
||||
}
|
||||
|
||||
const configData = await fs.promises.readFile(configPath, {
|
||||
encoding: 'utf-8'
|
||||
})
|
||||
@ -73,8 +89,10 @@ export class HTMLValidatorCommand extends Command {
|
||||
const dataToValidate = [...urls, ...files]
|
||||
const errors: Error[] = []
|
||||
let isValid = true
|
||||
for (const { data, type } of dataToValidate) {
|
||||
const loader = ora(`Validating ${data}`).start()
|
||||
const loader = ora(`Validating HTML (W3C)...`).start()
|
||||
const results: Result[] = []
|
||||
await Promise.all(
|
||||
dataToValidate.map(async ({ data, type }) => {
|
||||
try {
|
||||
const options = {
|
||||
format: 'json' as 'json' | undefined
|
||||
@ -103,19 +121,18 @@ export class HTMLValidatorCommand extends Command {
|
||||
} else {
|
||||
throw new Error('Invalid type')
|
||||
}
|
||||
const isValidHTML = result.messages.length === 0
|
||||
if (isValidHTML) {
|
||||
loader.succeed()
|
||||
const hasErrors = result.messages.some((message) => {
|
||||
return message.type === 'error'
|
||||
})
|
||||
if (!hasErrors) {
|
||||
results.push({ data, isSuccess: true })
|
||||
} else {
|
||||
loader.fail()
|
||||
results.push({ data, isSuccess: false })
|
||||
const messagesTable: string[][] = []
|
||||
for (const message of result.messages) {
|
||||
const row: string[] = []
|
||||
if (message.type === 'error') {
|
||||
const row: string[] = []
|
||||
row.push(chalk.red(message.type))
|
||||
} else {
|
||||
row.push(chalk.yellow(message.type))
|
||||
}
|
||||
row.push(message.message)
|
||||
const violation = message as ValidationMessageLocationObject
|
||||
if (violation.extract != null) {
|
||||
@ -125,20 +142,22 @@ export class HTMLValidatorCommand extends Command {
|
||||
}
|
||||
messagesTable.push(row)
|
||||
}
|
||||
}
|
||||
errors.push({ data, messagesTable })
|
||||
isValid = false
|
||||
}
|
||||
} catch (error) {
|
||||
loader.fail()
|
||||
isValid = false
|
||||
if (error instanceof Error) {
|
||||
const messagesTable: string[][] = [[error.message]]
|
||||
errors.push({ data, messagesTable })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
)
|
||||
if (!isValid) {
|
||||
loader.fail()
|
||||
printResults(results)
|
||||
for (const error of errors) {
|
||||
console.error(`\n${error.data}`)
|
||||
console.error(table(error.messagesTable))
|
||||
@ -147,10 +166,10 @@ export class HTMLValidatorCommand extends Command {
|
||||
console.error()
|
||||
throw new Error('HTML validation (W3C) failed!')
|
||||
}
|
||||
console.log()
|
||||
console.log(
|
||||
loader.succeed(
|
||||
`${chalk.bold.green('Success:')} HTML validation (W3C) passed! 🎉`
|
||||
)
|
||||
printResults(results)
|
||||
return 0
|
||||
} catch (error) {
|
||||
if (error instanceof Error) {
|
||||
|
@ -1,4 +1,5 @@
|
||||
{
|
||||
"extends": "@tsconfig/strictest/tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"target": "ESNext",
|
||||
"module": "ESNext",
|
||||
@ -7,8 +8,6 @@
|
||||
"outDir": "./build",
|
||||
"rootDir": "./src",
|
||||
"noEmit": true,
|
||||
"strict": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true
|
||||
"exactOptionalPropertyTypes": false
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user