From 97b1f62609b38641f23e03562f64583409537c5a Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Wed, 6 Sep 2023 16:05:00 +0300 Subject: [PATCH] Add eslint-config-prettier --- .eslintrc.json | 3 ++- package.json | 4 +++- yarn.lock | 12 ++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 028b81fc..73f75258 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,7 +10,8 @@ }, "extends": [ "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" + "plugin:@angular-eslint/template/process-inline-templates", + "prettier" ], "rules": { "@angular-eslint/component-selector": [ diff --git a/package.json b/package.json index a8edab0e..2af75819 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "@typescript-eslint/parser": "^4.26.0", "browserslist-config-openmrs": "^1.0.1", "eslint": "^7.6.0", + "eslint-config-prettier": "^9.0.0", "husky": "^4.3.0", "jasmine-core": "^3.8.0", "jasmine-spec-reporter": "~5.0.0", @@ -101,5 +102,6 @@ "prettier --write", "yarn run lint" ] - } + }, + "packageManager": "yarn@3.6.3" } diff --git a/yarn.lock b/yarn.lock index 76f78ba5..2024fbbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2224,6 +2224,7 @@ __metadata: browserslist-config-openmrs: ^1.0.1 core-js: ^2.5.4 eslint: ^7.6.0 + eslint-config-prettier: ^9.0.0 font-awesome: ^4.7.0 hammerjs: ^2.0.8 husky: ^4.3.0 @@ -5743,6 +5744,17 @@ __metadata: languageName: node linkType: hard +"eslint-config-prettier@npm:^9.0.0": + version: 9.0.0 + resolution: "eslint-config-prettier@npm:9.0.0" + peerDependencies: + eslint: ">=7.0.0" + bin: + eslint-config-prettier: bin/cli.js + checksum: 362e991b6cb343f79362bada2d97c202e5303e6865888918a7445c555fb75e4c078b01278e90be98aa98ae22f8597d8e93d48314bec6824f540f7efcab3ce451 + languageName: node + linkType: hard + "eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.0, eslint-scope@npm:^5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1"