ci: replace vnu html validator by html-validate (#759)

thegeeklab · Jan 7, 2024 · e11f0c8 · e11f0c8
1 parent c396971
commit e11f0c8
Show file tree

Hide file tree

Showing 8 changed files with 315 additions and 11 deletions.
diff --git a/.htmlvalidate.json b/.htmlvalidate.json
@@ -0,0 +1,8 @@
+{
+  "extends": ["html-validate:standard"],
+  "rules": {
+    "element-required-content": "off",
+    "element-permitted-content": "off",
+    "no-raw-characters": "off"
+  }
+}
diff --git a/.tarignore b/.tarignore
@@ -10,7 +10,8 @@
 .prettier*
 .eslintrc*
 .chglog
-.vnuignore
+.htmlvalidate*
+.lycheeignore*
 example*
 webpack*
 svgsprite*

diff --git a/.vnuignore b/.vnuignore
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
@@ -10,7 +10,7 @@ steps:
     image: docker.io/library/node:lts
     commands:
       - npm install --quiet --no-progress
-      - npm run lint
+      - npm run lint:js
     environment:
       FORCE_COLOR: "true"
 
@@ -29,10 +29,13 @@ steps:
       - hugo --panicOnWarning -s exampleSite/ -b http://localhost:8000/
 
   - name: html-validation
-    image: quay.io/thegeeklab/vnu
+    image: docker.io/library/node:lts
     group: test
     commands:
-      - vnu --skip-non-html --also-check-css --errors-only --filterfile .vnuignore exampleSite/public
+      - npm install --quiet --no-progress
+      - npm run lint:html
+    environment:
+      FORCE_COLOR: "true"
 
   - name: link-validation
     image: docker.io/lycheeverse/lychee

diff --git a/layouts/partials/menu-bundle.html b/layouts/partials/menu-bundle.html
@@ -52,7 +52,7 @@
                   <svg class="gdoc-icon {{ .icon }}"><use xlink:href="#{{ .icon }}"></use></svg>
                 {{ end }}
                 <a
-                  href="{{ if .external }}
+                  href="{{ if .external -}}
                     {{ .ref }}
                   {{- else -}}
                     {{ path.Join $this.RelPermalink $anchor }}

diff --git a/layouts/partials/menu-extra.html b/layouts/partials/menu-extra.html
@@ -27,11 +27,11 @@
       {{ if eq $target "header" }}
         <span>
           <a
-            href="{{ if .external }}
+            href="{{ if .external -}}
               {{ .ref }}
-            {{ else }}
+            {{- else -}}
               {{ relref $current .ref }}
-            {{ end }}"
+            {{- end }}"
             class="gdoc-header__link"
           >
             <svg class="gdoc-icon {{ .icon }}">