Skip to content

Commit fe1c89d

Browse files
Integrate check-build into lint pipeline
1 parent 223626e commit fe1c89d

File tree

5 files changed

+56
-25
lines changed

5 files changed

+56
-25
lines changed

.checkbuild

Lines changed: 0 additions & 19 deletions
This file was deleted.

.jscsrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"disallowQuotedKeysInObjects": true,
1414
"disallowSpacesInsideParentheses": true,
1515
"disallowKeywordsOnNewLine": ["else"],
16-
"disallowIdentifierNames": [],
16+
"disallowIdentifierNames": ["console"],
1717

1818
"requireCurlyBraces": true,
1919
"requireDotNotation": true,

bin/chappe.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ var ENV_AVAILABLE = [
8686

8787
// METHODS
8888

89+
// jscs:disable disallowIdentifierNames
90+
8991
function run() {
9092
// Run help?
9193
if (args.help) {
@@ -330,6 +332,8 @@ function setup_gulp_logging(instance) {
330332
});
331333
}
332334

335+
// jscs:enable disallowIdentifierNames
336+
333337

334338
// CALLS
335339

gulpfile.js

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var gulp_replace = require("gulp-replace");
3636
var gulp_header = require("gulp-header");
3737
var gulp_pug_lint = require("gulp-pug-lint");
3838
var gulp_sass_lint = require("gulp-sass-lint");
39+
var gulp_jshint = require("gulp-jshint");
40+
var gulp_jscs = require("gulp-jscs");
3941
var gulp_sizereport = require("gulp-sizereport");
4042
var gulp_sitemap = require("gulp-sitemap");
4143
var gulp_notify = require("gulp-notify");
@@ -1310,6 +1312,48 @@ var lint_sass_stylesheets = function() {
13101312
};
13111313

13121314

1315+
/*
1316+
Lints JS scripts (with JSHint)
1317+
*/
1318+
var lint_js_scripts_jshint = function() {
1319+
return gulp.src([
1320+
CONTEXT.PATH_SOURCES + "/javascripts/**/*.js",
1321+
CONTEXT.PATH_CHAPPE + "/bin/*.js"
1322+
])
1323+
.pipe(
1324+
gulp_jshint({
1325+
defaultFile : path.join(
1326+
CONTEXT.PATH_CHAPPE, ".jshintrc"
1327+
)
1328+
})
1329+
)
1330+
.pipe(
1331+
gulp_jshint.reporter("fail")
1332+
);
1333+
};
1334+
1335+
1336+
/*
1337+
Lints JS scripts (with JSCS)
1338+
*/
1339+
var lint_js_scripts_jscs = function() {
1340+
return gulp.src([
1341+
CONTEXT.PATH_SOURCES + "/javascripts/**/*.js",
1342+
CONTEXT.PATH_CHAPPE + "/bin/*.js"
1343+
])
1344+
.pipe(
1345+
gulp_jscs({
1346+
configPath : path.join(
1347+
CONTEXT.PATH_CHAPPE, ".jscsrc"
1348+
)
1349+
})
1350+
)
1351+
.pipe(
1352+
gulp_jscs.reporter("fail")
1353+
);
1354+
};
1355+
1356+
13131357
/*
13141358
Lints project built code
13151359
*/
@@ -1319,7 +1363,9 @@ var lint = function() {
13191363

13201364
gulp.parallel(
13211365
lint_jade_templates,
1322-
lint_sass_stylesheets
1366+
lint_sass_stylesheets,
1367+
lint_js_scripts_jshint,
1368+
lint_js_scripts_jscs
13231369
)
13241370
);
13251371
}();

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@
3838
"build": "./bin/chappe.js build --example=crisp-docs",
3939
"clean": "./bin/chappe.js clean --example=crisp-docs",
4040
"dev": "./bin/chappe.js build --example=crisp-docs && ./bin/chappe.js watch --example=crisp-docs",
41-
"test": "check-build && ./bin/chappe.js lint --example=crisp-docs"
42-
},
43-
"devDependencies": {
44-
"check-build": "2.8.2"
41+
"test": "./bin/chappe.js lint --example=crisp-docs"
4542
},
4643
"dependencies": {
4744
"babel-preset-es2015": "6.9.x",
@@ -67,8 +64,11 @@
6764
"gulp-replace": "1.1.x",
6865
"gulp-pug-lint": "0.1.x",
6966
"gulp-sass-lint": "1.4.x",
67+
"gulp-jshint": "2.1.x",
68+
"gulp-jscs": "4.1.x",
7069
"gulp-sizereport": "1.2.x",
7170
"gulp-notify": "4.0.x",
71+
"jshint": "2.13.x",
7272
"marked": "4.0.x",
7373
"markdown-toc": "1.2.x",
7474
"drafter": "2.0.x",

0 commit comments

Comments
 (0)