github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lint JS files w/out extension too (#453)

Browse Source 
Prior to this change, JS files without extension had not been linted.

To match them, we need a combination of positive and negative globbing
that does not mix well with the existing file selection for linting. Thus, we use
npm-run-all to run two ESLint invocations unconditionally in sequence
while still preserving the error code.

* Lint JS w/out extension too
* Fix newly surfaced linting errors
* Make use of npm-run-all for test script too
This commit is contained in:
Raphael von der Grün
2018-06-18 23:48:02 +02:00
committed by GitHub
parent 2c3db19310
commit 393dad6349
16 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/build
+10 -9
View File
@@ -19,24 +19,25 @@
under the License.
*/
var args = process.argv;
var args = process.argv;
var Api = require('./Api');
var nopt = require('nopt');
var path = require('path');
// Support basic help commands
if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0)
if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) >= 0) {
require('./lib/build').help();
}
// Do some basic argument parsing
var buildOpts = nopt({
'verbose' : Boolean,
'silent' : Boolean,
'debug' : Boolean,
'release' : Boolean,
'verbose': Boolean,
'silent': Boolean,
'debug': Boolean,
'release': Boolean,
'nobuild': Boolean,
'buildConfig' : path
}, { 'd' : '--verbose' });
'buildConfig': path
}, { 'd': '--verbose' });
// Make buildOptions compatible with PlatformApi build method spec
buildOpts.argv = buildOpts.argv.original;
@@ -44,7 +45,7 @@ buildOpts.argv = buildOpts.argv.original;
require('./loggingHelper').adjustLoggerLevel(buildOpts);
new Api().build(buildOpts)
.catch(function(err) {
.catch(function (err) {
console.error(err.stack);
process.exit(2);
});
bin/templates/cordova/clean
+6 -6
View File
@@ -20,11 +20,11 @@
*/
var Api = require('./Api');
var path = require('path');
var path = require('path');
var nopt = require('nopt');
// Support basic help commands
if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]));
console.log('Cleans the project directory.');
process.exit(0);
@@ -32,9 +32,9 @@ if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >=
// Do some basic argument parsing
var opts = nopt({
'verbose' : Boolean,
'silent' : Boolean
}, { 'd' : '--verbose' });
'verbose': Boolean,
'silent': Boolean
}, { 'd': '--verbose' });
// Make buildOptions compatible with PlatformApi clean method spec
opts.argv = opts.argv.original;
@@ -45,7 +45,7 @@ opts.noPrepare = true;
require('./loggingHelper').adjustLoggerLevel(opts);
new Api().clean(opts)
.catch(function(err) {
.catch(function (err) {
console.error(err.stack);
process.exit(2);
});
bin/templates/cordova/lib/install-device
+8 -8
View File
@@ -19,23 +19,23 @@
under the License.
*/
var device = require('./device'),
args = process.argv;
var device = require('./device');
var args = process.argv;
if(args.length > 2) {
if (args.length > 2) {
var install_target;
if (args[2].substring(0, 9) == '--target=') {
if (args[2].substring(0, 9) === '--target=') {
install_target = args[2].substring(9, args[2].length);
device.install(install_target).done(null, function(err) {
device.install(install_target).done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
} else {
} else {
console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
process.exit(2);
}
}
} else {
device.install().done(null, function(err) {
device.install().done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/lib/install-emulator
+7 -7
View File
@@ -19,20 +19,20 @@
under the License.
*/
var emulator = require('./emulator'),
args = process.argv;
var emulator = require('./emulator');
var args = process.argv;
var install_target;
if(args.length > 2) {
if (args[2].substring(0, 9) == '--target=') {
if (args.length > 2) {
if (args[2].substring(0, 9) === '--target=') {
install_target = args[2].substring(9, args[2].length);
} else {
} else {
console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
process.exit(2);
}
}
}
emulator.install(install_target).done(null, function(err) {
emulator.install(install_target).done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/lib/list-devices
+4 -4
View File
@@ -22,12 +22,12 @@
var devices = require('./device');
// Usage support for when args are given
require('./check_reqs').check_android().then(function() {
devices.list().done(function(device_list) {
device_list && device_list.forEach(function(dev) {
require('./check_reqs').check_android().then(function () {
devices.list().done(function (device_list) {
device_list && device_list.forEach(function (dev) {
console.log(dev);
});
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/lib/list-emulator-images
+4 -4
View File
@@ -22,12 +22,12 @@
var emulators = require('./emulator');
// Usage support for when args are given
require('./check_reqs').check_android().then(function() {
emulators.list_images().done(function(emulator_list) {
emulator_list && emulator_list.forEach(function(emu) {
require('./check_reqs').check_android().then(function () {
emulators.list_images().done(function (emulator_list) {
emulator_list && emulator_list.forEach(function (emu) {
console.log(emu.name);
});
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/lib/list-started-emulators
+4 -4
View File
@@ -22,12 +22,12 @@
var emulators = require('./emulator');
// Usage support for when args are given
require('./check_reqs').check_android().then(function() {
emulators.list_started().done(function(emulator_list) {
emulator_list && emulator_list.forEach(function(emu) {
require('./check_reqs').check_android().then(function () {
emulators.list_started().done(function (emulator_list) {
emulator_list && emulator_list.forEach(function (emu) {
console.log(emu);
});
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/lib/start-emulator
+7 -8
View File
@@ -19,21 +19,20 @@
under the License.
*/
var emulator = require('./emulator'),
args = process.argv;
var emulator = require('./emulator');
var args = process.argv;
var install_target;
if(args.length > 2) {
if (args[2].substring(0, 9) == '--target=') {
if (args.length > 2) {
if (args[2].substring(0, 9) === '--target=') {
install_target = args[2].substring(9, args[2].length);
} else {
} else {
console.error('ERROR : argument \'' + args[2] + '\' not recognized.');
process.exit(2);
}
}
}
emulator.start(install_target).done(null, function(err) {
emulator.start(install_target).done(null, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/log
+6 -6
View File
@@ -19,17 +19,17 @@
under the License.
*/
var log = require('./lib/log'),
reqs = require('./lib/check_reqs'),
args = process.argv;
var log = require('./lib/log');
var reqs = require('./lib/check_reqs');
var args = process.argv;
// Usage support for when args are given
if(args.length > 2) {
if (args.length > 2) {
log.help();
} else {
reqs.run().done(function() {
reqs.run().done(function () {
return log.run();
}, function(err) {
}, function (err) {
console.error('ERROR: ' + err);
process.exit(2);
});
bin/templates/cordova/run
+12 -11
View File
@@ -24,22 +24,23 @@ var nopt = require('nopt');
var path = require('path');
// Support basic help commands
if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0)
if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >= 0) {
require('./lib/run').help();
}
// Do some basic argument parsing
var runOpts = nopt({
'verbose' : Boolean,
'silent' : Boolean,
'debug' : Boolean,
'release' : Boolean,
'verbose': Boolean,
'silent': Boolean,
'debug': Boolean,
'release': Boolean,
'nobuild': Boolean,
'buildConfig' : path,
'archs' : String,
'device' : Boolean,
'buildConfig': path,
'archs': String,
'device': Boolean,
'emulator': Boolean,
'target' : String
}, { 'd' : '--verbose' });
'target': String
}, { 'd': '--verbose' });
// Make runOptions compatible with PlatformApi run method spec
runOpts.argv = runOpts.argv.remain;
@@ -47,7 +48,7 @@ runOpts.argv = runOpts.argv.remain;
require('./loggingHelper').adjustLoggerLevel(runOpts);
new Api().run(runOpts)
.catch(function(err) {
.catch(function (err) {
console.error(err, err.stack);
process.exit(2);
});
bin/templates/cordova/version
+1 -1
View File
@@ -20,7 +20,7 @@
*/
// Coho updates this line:
var VERSION = "7.2.0-dev";
var VERSION = '7.2.0-dev';
module.exports.version = VERSION;