Jdrewniak has uploaded a new change for review. https://gerrit.wikimedia.org/r/325280
Change subject: Improving CSS linting ...................................................................... Improving CSS linting [WIP] should throw stylelint errors in CI. Catching all postCSS compile errors now in addition to stylelint errors. Removing the tests/lint.js script and trying to run gulp from packages.json instead. Change-Id: Id728d96e0935bdc2125fdcb78f7272d6a23a9090 --- M gulpfile.js M package.json D tests/lint.js 3 files changed, 18 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals refs/changes/80/325280/1 diff --git a/gulpfile.js b/gulpfile.js index 9b56a63..c48a570 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -14,6 +14,8 @@ sprity = require( 'sprity' ), postCSSNext = require( 'postcss-cssnext' ), postCSSImport = require( 'postcss-import' ), + postCSSReporter = require( 'postcss-reporter' ), + gulpStylelint = require( 'gulp-stylelint' ), del = require( 'del' ); var plugins = gulpLoadPlugins(), @@ -297,8 +299,18 @@ .pipe( plugins.jscs.reporter( 'fail' ) ); } ); -gulp.task( 'lint-css', function lintCssTask() { - const gulpStylelint = require( 'gulp-stylelint' ); +gulp.task( 'validate-postCSS', function () { + return gulp + .src( [ 'dev/**/postcss/*.css', '!dev/**/postcss/_*.css' ] ) + .pipe( plugins.postcss( [ + postCSSImport(), + postCSSNext( { browsers: [ 'last 5 versions', 'ie 6-8', 'Firefox >= 3.5', 'iOS >= 4', 'Android >= 2.3' ] } ), + postCSSReporter( { clearMessages: true, throwError: true } ) + ], { map: { inline: true } } + ) ); +} ); + +gulp.task( 'lint-css', [ 'validate-postCSS' ], function () { return gulp .src( 'dev/**/postcss/*.css' ) diff --git a/package.json b/package.json index 25a393c..91c0b64 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "private": true, "scripts": { - "test": "node ./tests/lint.js", + "gulp": "gulp", + "test": "npm run gulp -- lint", "casperjs": "casperjs test ./tests/casper.js", "elbucketing": "casperjs test ./tests/elbucketing.js", "el-abtest3": "casperjs test ./tests/el-abtest3.js", @@ -29,7 +30,7 @@ "gulp-rename": "^1.2.2", "gulp-rev": "^6.0.1", "gulp-rev-replace": "^0.4.3", - "gulp-stylelint": "^3.0.0", + "gulp-stylelint": "^3.5.0", "gulp-uglify": "^1.4.2", "gulp-useref": "^3.0.5", "handlebars": "^4.0.4", @@ -40,6 +41,7 @@ "moment": "^2.10.6", "postcss-cssnext": "^2.4.0", "postcss-import": "^8.0.2", + "postcss-reporter": "^2.0.0", "preq": "^0.4.6", "sprity": "^1.0.8", "stylelint-config-wikimedia": "^0.3.0", diff --git a/tests/lint.js b/tests/lint.js deleted file mode 100644 index 834ae04..0000000 --- a/tests/lint.js +++ /dev/null @@ -1,30 +0,0 @@ -var gulp = require( 'gulp' ), - jshint = require( 'gulp-jshint' ), - jscs = require( 'gulp-jscs' ), - stylelint = require( 'gulp-stylelint' ); - -gulp.task( 'lint-js', function () { - var devFolder = 'dev/**/*.js'; - - gulp.src( [ '*.js', devFolder ] ) - .pipe( jshint( '.jshintrc' ) ) - .pipe( jshint.reporter( 'default' ) ) - .pipe( jshint.reporter( 'fail' ) ) - .pipe( jscs() ) - .pipe( jscs.reporter() ) - .pipe( jscs.reporter( 'fail' ) ); -} ); - -gulp.task( 'lint-css', function lintCssTask() { - return gulp - .src( 'dev/**/postcss/*.css' ) - .pipe( stylelint( { - reporters: [ - { formatter: 'string', console: true } - ] - } ) ); -} ); - -gulp.task ( 'lint', [ 'lint-js', 'lint-css' ] ); - -gulp.start( 'lint' ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/325280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id728d96e0935bdc2125fdcb78f7272d6a23a9090 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/portals Gerrit-Branch: master Gerrit-Owner: Jdrewniak <jdrewn...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits