diff --git a/ui/.eslintrc.json b/.eslintrc.json similarity index 100% rename from ui/.eslintrc.json rename to .eslintrc.json diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 12a49dd7c8..7841ca989e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,13 +9,8 @@ on: - 'translation/dest/**' jobs: - format: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - run: yarn install && yarn run check-format lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: cd ui && yarn install && yarn run lint + - run: yarn install && yarn run check-format && yarn run lint diff --git a/package.json b/package.json index 6895d51985..c368718a31 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,17 @@ "prettier": "2.2.1", "xml2js": "0.4.19" }, + "devDependencies": { + "@typescript-eslint/eslint-plugin": "^4.20.0", + "@typescript-eslint/parser": "^4.20.0", + "eslint": "^7.23.0", + "eslint-config-prettier": "^8.1.0" + }, "scripts": { "format": "prettier --write .", - "check-format": "prettier --check ." + "check-format": "prettier --check .", + "lint": "eslint . --ext .ts --format visualstudio", + "lint-fix": "eslint . --ext .ts --fix" }, "workspaces": [ "ui", diff --git a/ui/package.json b/ui/package.json index 4ca69b42b1..fd40ecec61 100644 --- a/ui/package.json +++ b/ui/package.json @@ -12,10 +12,6 @@ "breakpoint-sass": "^2.7.1" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^4.20.0", - "@typescript-eslint/parser": "^4.20.0", - "eslint": "^7.23.0", - "eslint-config-prettier": "^8.1.0", "glob": "^7.1.3", "gulp": "^4.0.2", "gulp-autoprefixer": "^7.0.1", @@ -27,9 +23,5 @@ "gulp-sass-inheritance": "^1.1", "gulp-size": "^3", "gulp-sourcemaps": "^3.0.0" - }, - "scripts": { - "lint": "eslint . --ext .ts --format visualstudio", - "lint-fix": "eslint . --ext .ts --fix" } }