Move vnu-jar to devDependencies and remove completely htmlhint.

1 files changed, 39 insertions, 16 deletions

diff --git a/build/htmllint.js b/build/htmllint.js
index a40ff922ae..f69d801411 100644
--- a/build/htmllint.js
+++ b/build/htmllint.js
@@ -1,23 +1,46 @@
+#!/usr/bin/env node
+
+/*!
+ * Script to run vnu-jar if Java is available.
+ * Copyright 2017 The Bootstrap Authors
+ * Copyright 2017 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
 'use strict'
 
 const childProcess = require('child_process')
-const fs = require('fs')
+const vnu = require('vnu-jar')
+
+childProcess.exec('java -version', function (error) {
+  if (error) {
+    console.error('Skipping HTML lint test; Java is missing.')
+    return
+  }
 
-if (fs.existsSync('vnu.jar')) {
-  childProcess.exec('java -version', function (error) {
-    if (error) {
-      console.error('skipping HTML lint test. java missing.')
-      return
-    }
+  const ignores = [
+    'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime-local”, “email”, “hidden”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
+    'Attribute “autocomplete” not allowed on element “button” at this point.',
+    'Attribute “title” not allowed on element “circle” at this point.',
+    'Bad value “tablist” for attribute “role” on element “nav”.',
+    'Element “img” is missing required attribute “src”.',
+    'Element “legend” not allowed as child of element “div” in this context.*'
+  ].join('|')
 
-    const vnu = childProcess.spawn(
-                                   'java',
-                                   ['-jar', 'vnu.jar', '--skip-non-html', '_gh_pages/'],
-                                   { stdio: 'inherit' }
-                                  )
+  const args = [
+    '-jar',
+    vnu,
+    '--asciiquotes',
+    '--errors-only',
+    '--skip-non-html',
+    `--filterpattern "${ignores}"`,
+    '_gh_pages/',
+    'js/tests/'
+  ]
 
-    vnu.on('exit', process.exit)
+  return childProcess.spawn('java', args, {
+    shell: true,
+    stdio: 'inherit'
   })
-} else {
-  console.error('skipping HTML lint test. vnu.jar missing.')
-}
+  .on('exit', process.exit)
+})