diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71f445080..1e99d1c55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,8 +196,7 @@ lint_front: - cd front - yarn install --frozen-lockfile script: - - yarn lint --max-warnings 0 - - yarn lint:tsc + - yarn lint test_scripts: stage: test diff --git a/front/package.json b/front/package.json index 453c982df..b79415888 100644 --- a/front/package.json +++ b/front/package.json @@ -16,11 +16,12 @@ "test": "vitest run", "test:unit": "vitest run --coverage", "test:generate-mock-server": "msw-auto-mock ../docs/schema.yml -o test/msw-server.ts --node", - "lint": "eslint --cache --cache-strategy content --ext .ts,.js,.vue,.json,.html,.cjs . cypress public/embed.html src test ui-docs", + "lint": "yarn lint:es && yarn lint:tsc", + "lint:es": "eslint --max-warnings 0 --cache --cache-strategy content --ext .ts,.js,.vue,.json,.html,.cjs . cypress public/embed.html src test ui-docs", "lint:tsc": "vue-tsc --noEmit --incremental && tsc --noEmit --incremental -p cypress src test ui-docs", "generate-types-from-local-schema": "yarn run openapi-typescript ../api/funkwhale_api/common/schema.yml -o src/generated/types.ts", "generate-types-from-remote-schema": "yarn run openapi-typescript https://docs.funkwhale.audio/develop/swagger/schema.yml -o src/generated/types.ts", - "fmt": "yarn lint --fix", + "fmt:es": "yarn lint:es --fix", "fmt:html": "node --experimental-strip-types node_modules/prettier/bin/prettier.cjs index.html public/embed.html --write" }, "dependencies": {