root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Improve vnu-jar.js (#34075) 

* switch to `execFile` for the java version command
* simplify our ignores and removed no longer needed ones
* remove `--no-langdetect` since it doesn't seem to trigger any issues any more
This commit is contained in:
XhmikosR 2021-06-08 08:44:51 +03:00 committed by GitHub
parent 7968a074a5
commit 232a40a5f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/vnu-jar.js
View File

@ -9,10 +9,10 @@
'use strict' 'use strict'
const childProcess = require('child_process') const { execFile, spawn } = require('child_process')
const vnu = require('vnu-jar') const vnu = require('vnu-jar')
childProcess.exec('java -version', (error, stdout, stderr) => { execFile('java', ['-version'], (error, stdout, stderr) => {
if (error) { if (error) {
console.error('Skipping vnu-jar test; Java is missing.') console.error('Skipping vnu-jar test; Java is missing.')
return return
@ -21,23 +21,15 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
const is32bitJava = !/64-Bit/.test(stderr) const is32bitJava = !/64-Bit/.test(stderr)
// vnu-jar accepts multiple ignores joined with a `|`. // 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 = [ const ignores = [
// "autocomplete" is included in <button> and checkboxes and radio <input>s due to // "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 // 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” is only allowed when the input type is.*',
'Attribute “autocomplete” not allowed on element “button” at this point.', '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. // Content → Reboot uses various date/time inputs as a visual example.
// Documentation does not rely on them being usable. // Documentation does not rely on them being usable.
'The “date” input type is not supported in all browsers.*', 'The “(?:date|week|month|color|datetime-local|time)” input type is not supported in all browsers.*'
'The “week” input type is not supported in all browsers.*',
'The “month” input type is not supported in all browsers.*',
'The “color” input type is not supported in all browsers.*',
'The “datetime-local” input type is not supported in all browsers.*',
'The “time” input type is not supported in all browsers.*'
].join('|') ].join('|')
const args = [ const args = [
@ -45,8 +37,6 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
`"${vnu}"`, `"${vnu}"`,
'--asciiquotes', '--asciiquotes',
'--skip-non-html', '--skip-non-html',
// Ignore the language code warnings
'--no-langdetect',
'--Werror', '--Werror',
`--filterpattern "${ignores}"`, `--filterpattern "${ignores}"`,
'_site/', '_site/',
@ -58,7 +48,7 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
args.splice(0, 0, '-Xss512k') args.splice(0, 0, '-Xss512k')
} }
return childProcess.spawn('java', args, { return spawn('java', args, {
shell: true, shell: true,
stdio: 'inherit' stdio: 'inherit'
}) })