Skip to content

Commit

Permalink
[compile-app-settings] use default jshint settings
Browse files Browse the repository at this point in the history
  • Loading branch information
alxndrsn committed Jun 12, 2018
1 parent d168255 commit d75478a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 16 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## v1.16.16
* [compile-app-settings] use default jshint settings

## v1.16.15
* [compile-contact-summary] fix test
* [compile-app-settings] share jshint reporting code
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "medic-conf",
"version": "1.16.15",
"version": "1.16.16",
"description": "Configure Medic Mobile deployments",
"main": "index.js",
"scripts": {
Expand Down
7 changes: 0 additions & 7 deletions src/lib/compile-contact-summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@ const templatedJs = require('../lib/templated-js');

function lint(code) {
jshintWithReport('contact-summary', code, {
esversion: 5,
eqeqeq: true,
funcscope: true,
latedef: 'nofunc',
nonbsp: true,
predef: [ 'contact', 'lineage', 'reports' ],
undef: true,
unused: true,
});
}

Expand Down
7 changes: 0 additions & 7 deletions src/lib/compile-nools-rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,7 @@ const templatedJs = require('./templated-js');

function lint(code) {
jshintWithReport('nools rules', code, {
esversion: 5,
eqeqeq: true,
funcscope: true,
latedef: 'nofunc',
nonbsp: true,
predef: [ 'c', 'emit', 'Contact', 'Target', 'Task', 'Utils' ],
undef: true,
unused: true,
});
}

Expand Down
21 changes: 21 additions & 0 deletions src/lib/jshint-with-report.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
const _ = require('lodash');
const jshint = require('jshint').JSHINT;
const withLineNumbers = require('./with-line-numbers');

const DEFAULT_OPTS = {
bitwise: true,
esversion: 5,
eqeqeq: true,
freeze: true,
funcscope: true,
futurehostile: true,
latedef: 'nofunc',
noarg: true,
nocomma: true,
nonbsp: true,
nonew: true,
notypeof: true,
shadow: 'inner',
undef: true,
unused: true,
};

module.exports = (description, code, options) => {
options = _.extend(DEFAULT_OPTS, options);

jshint(code, options);

if(jshint.errors.length) {
Expand Down

0 comments on commit d75478a

Please sign in to comment.