From 2c46f0dc1347bc59f5c0995d2dc887f545021a32 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 23 May 2021 21:38:38 +0200 Subject: [PATCH] [ticket/16775] Only run valid eslint runs and fix linting errors PHPBB3-16775 --- .github/check-js.sh | 10 +++++----- gulpfile.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/check-js.sh b/.github/check-js.sh index ef968375fd..ff72f51e69 100755 --- a/.github/check-js.sh +++ b/.github/check-js.sh @@ -14,8 +14,8 @@ set +x sudo npm install -g > /dev/null npm ci > /dev/null set -x -node_modules/xo/cli.js "phpBB/adm/style/*.js" -node_modules/xo/cli.js "phpBB/assets/javascript/*.js" -node_modules/xo/cli.js "phpBB/style/all/js/*.js" -node_modules/xo/cli.js "phpBB/style/prosilver/template/*.js" -node_modules/xo/cli.js "gulpfile.js" +# node_modules/eslint/bin/eslint.js "phpBB/adm/style/*.js" # Currently disabled as no file is linted +node_modules/eslint/bin/eslint.js "phpBB/assets/javascript/*.js" +# node_modules/eslint/bin/eslint.js "phpBB/style/all/js/*.js" # Currently disabled as no file is linted +# node_modules/eslint/bin/eslint.js "phpBB/style/prosilver/template/*.js" # Currently disabled as no file is linted +node_modules/eslint/bin/eslint.js "gulpfile.js" diff --git a/gulpfile.js b/gulpfile.js index 474b4c84c7..921907115e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,7 +23,7 @@ function styles() { postcss([ autoprefixer(), sorting(sortOrder), - ]), + ]) ) .pipe(gulp.dest(paths.styles.css)); } @@ -48,7 +48,7 @@ function minify() { .pipe( postcss([ cssnano(), - ]), + ]) ) .pipe(rename({ suffix: '.min',