From 6b884dcd7663085bc01e4308652f2d27ae07eae2 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 30 Oct 2017 01:28:52 +0200 Subject: Clean up package.json scripts. (#24583) * rename build/htmllint.js to build/vnu-jar.js * remove the unused `bash` script * split the `docs-lint` scripts * fix watch-js script to run only the parent `js-compile` script --- build/htmllint.js | 46 ---------------------------------------------- build/vnu-jar.js | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 build/htmllint.js create mode 100644 build/vnu-jar.js (limited to 'build') diff --git a/build/htmllint.js b/build/htmllint.js deleted file mode 100644 index f69d80141..000000000 --- a/build/htmllint.js +++ /dev/null @@ -1,46 +0,0 @@ -#!/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 vnu = require('vnu-jar') - -childProcess.exec('java -version', function (error) { - if (error) { - console.error('Skipping HTML lint test; Java is 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 args = [ - '-jar', - vnu, - '--asciiquotes', - '--errors-only', - '--skip-non-html', - `--filterpattern "${ignores}"`, - '_gh_pages/', - 'js/tests/' - ] - - return childProcess.spawn('java', args, { - shell: true, - stdio: 'inherit' - }) - .on('exit', process.exit) -}) diff --git a/build/vnu-jar.js b/build/vnu-jar.js new file mode 100644 index 000000000..f69d80141 --- /dev/null +++ b/build/vnu-jar.js @@ -0,0 +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 vnu = require('vnu-jar') + +childProcess.exec('java -version', function (error) { + if (error) { + console.error('Skipping HTML lint test; Java is 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 args = [ + '-jar', + vnu, + '--asciiquotes', + '--errors-only', + '--skip-non-html', + `--filterpattern "${ignores}"`, + '_gh_pages/', + 'js/tests/' + ] + + return childProcess.spawn('java', args, { + shell: true, + stdio: 'inherit' + }) + .on('exit', process.exit) +}) -- cgit v1.2.3