diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3a493e33..380f359ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,10 +136,7 @@ eslint: - cd front - yarn install script: - # We search for all files ending with .vue or .js in src which changed in relation to develop - # and lint them. This way we focus on some errors instead of checking the hole repository - - export changedFiles=$(git diff --relative --name-only --diff-filter=d origin/develop -- src/ | grep -E "\.(vue|js)$") - - yarn run eslint --quiet -f table $(echo $changedFiles | tr '\n' ' ') + - yarn lint cache: key: "$CI_PROJECT_ID__eslint_npm_cache" paths: diff --git a/front/.eslintrc.js b/front/.eslintrc.js index c01b98750..c07080821 100644 --- a/front/.eslintrc.js +++ b/front/.eslintrc.js @@ -20,5 +20,7 @@ module.exports = { 'vue' ], rules: { + "vue/no-v-html": "off", // TODO: tackle this properly + "vue/no-use-v-if-with-v-for": "off" } } diff --git a/front/package.json b/front/package.json index 791dd97f4..75089cc75 100644 --- a/front/package.json +++ b/front/package.json @@ -8,7 +8,7 @@ "serve": "[ ! -d src/translations ] && npm run i18n-compile; vue-cli-service serve --port ${VUE_PORT:-8080} --host ${VUE_HOST:-0.0.0.0}", "build": "scripts/i18n-compile.sh && vue-cli-service build", "test:unit": "vue-cli-service test:unit --reporter mocha-junit-reporter", - "lint": "eslint $(git status --porcelain --untracked-files=no | grep -E '(A|M) ' | cut -d' ' -f3 | sed s_front/__ | grep -E '.(js|vue)$')", + "lint": "eslint --ext .js,.vue src", "i18n-compile": "scripts/i18n-compile.sh", "i18n-extract": "scripts/i18n-extract.sh", "fix-fomantic-css": "scripts/fix-fomantic-css.sh", diff --git a/front/src/EmbedFrame.vue b/front/src/EmbedFrame.vue index 8d0949b4f..bc31d51e4 100644 --- a/front/src/EmbedFrame.vue +++ b/front/src/EmbedFrame.vue @@ -2,57 +2,110 @@