Skip to content

Commit

Permalink
Manually backport #34075 and #34279
Browse files Browse the repository at this point in the history
Improve and clean up vnu-jar.js
  • Loading branch information
XhmikosR committed Jun 24, 2021
1 parent 889c22f commit fc40dc4
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions build/vnu-jar.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

'use strict'

const childProcess = require('child_process')
const { execFile, spawn } = require('child_process')
const vnu = require('vnu-jar')

childProcess.exec('java -version', (error, stdout, stderr) => {
execFile('java', ['-version'], (error, stdout, stderr) => {
if (error) {
console.error('Skipping vnu-jar test; Java is missing.')
return
Expand All @@ -21,19 +21,12 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
const is32bitJava = !/64-Bit/.test(stderr)

// vnu-jar accepts multiple ignores joined with a `|`.
// Also note that the ignores are regular expressions.
// Also note that the ignores are string regular expressions.
const ignores = [
// "autocomplete" is included in <button> and checkboxes and radio <input>s due to
// Firefox's non-standard autocomplete behavior - see https://bugzilla.mozilla.org/show_bug.cgi?id=654072
'Attribute “autocomplete” is only allowed when the input type is.*',
'Attribute “autocomplete” not allowed on element “button” at this point.',
// Markup used in Components → Forms → Layout → Form grid → Horizontal form is currently invalid,
// but used this way due to lack of support for flexbox layout on <fieldset> element in most browsers
'Element “legend” not allowed as child of element “div” in this context.*',
// Content → Reboot uses various date/time inputs as a visual example.
// Documentation does not rely on them being usable.
'The “date” input type is not supported in all browsers.*',
'The “time” input type is not supported in all browsers.*',
// IE11 doesn't recognise <main> / give the element an implicit "main" landmark.
// Explicit role="main" is redundant for other modern browsers, but still valid.
'The “main” role is unnecessary for element “main”.'
Expand All @@ -44,8 +37,6 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
`"${vnu}"`,
'--asciiquotes',
'--skip-non-html',
// Ignore the language code warnings
'--no-langdetect',
'--Werror',
`--filterpattern "${ignores}"`,
'_site/',
Expand All @@ -57,7 +48,7 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
args.splice(0, 0, '-Xss512k')
}

return childProcess.spawn('java', args, {
return spawn('java', args, {
shell: true,
stdio: 'inherit'
})
Expand Down

0 comments on commit fc40dc4

Please sign in to comment.