diff options
author | Lukas Eipert <leipert@gitlab.com> | 2018-06-16 13:59:26 +0200 |
---|---|---|
committer | Lukas Eipert <leipert@gitlab.com> | 2018-06-16 14:02:36 +0200 |
commit | a6312081d811d87ea2c3778c52acaa8476361eff (patch) | |
tree | f5271ced966b168e4bdfe2f084a73180ce288f62 | |
parent | f733d4f8979a7570a9347186dbe0f8c663c2ff4f (diff) | |
download | gitlab-ce-a6312081d811d87ea2c3778c52acaa8476361eff.tar.gz |
use eslint config parameter instead of sedleipert-proper-eslint-report
eslint has the possibility to ignore inline config `no-inline-config`, so we should use that
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7304b9c057..30c21b452e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -816,8 +816,6 @@ lint:javascript:report: before_script: [] script: - date - - find app/ spec/ -name '*.js' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files - - date - yarn run eslint-report || true # ignore exit code artifacts: name: eslint-report diff --git a/package.json b/package.json index 6a52af10dc3..cfe347c6eaa 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dev-server": "nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'", "eslint": "eslint --max-warnings 0 --ext .js,.vue .", "eslint-fix": "eslint --max-warnings 0 --ext .js,.vue --fix .", - "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html .", + "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js", "karma-coverage": "BABEL_ENV=coverage karma start --single-run true config/karma.config.js", "karma-start": "BABEL_ENV=karma karma start config/karma.config.js", |