Skip to content

Commit

Permalink
Fix prettier/eslint integration (#46)
Browse files Browse the repository at this point in the history
* Configure code line max-len

* Remove prettier config from eslint config file

* Fix format

* Format adjustment

* Format adjustment

* Format adjustment

* Format adjustment

* Integrate with eslint max-len

* Integrate with eslint max-len

* Integrate with eslint max-len

* Dont enforce eslint prettier rules

* Test prettier

* Test prettier 2

* Separate responsibilities between eslint and prettier

* Set 80 chars per line format

* Update eslint-config-prettier

* Rollback format changes

* Rollback format changes
  • Loading branch information
hectorgomezv authored Aug 24, 2022
1 parent b49f251 commit 318de92
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'prettier',
],
root: true,
env: {
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
}
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"@typescript-eslint/eslint-plugin": "^5.32.0",
"@typescript-eslint/parser": "^5.32.0",
"eslint": "^8.21.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-config-prettier": "^8.5.0",
"husky": "^8.0.0",
"jest": "28.1.2",
"prettier": "^2.3.2",
Expand Down
36 changes: 2 additions & 34 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2896,7 +2896,7 @@ __metadata:
languageName: node
linkType: hard

"eslint-config-prettier@npm:^8.3.0":
"eslint-config-prettier@npm:^8.5.0":
version: 8.5.0
resolution: "eslint-config-prettier@npm:8.5.0"
peerDependencies:
Expand All @@ -2907,21 +2907,6 @@ __metadata:
languageName: node
linkType: hard

"eslint-plugin-prettier@npm:^4.0.0":
version: 4.2.1
resolution: "eslint-plugin-prettier@npm:4.2.1"
dependencies:
prettier-linter-helpers: ^1.0.0
peerDependencies:
eslint: ">=7.28.0"
prettier: ">=2.0.0"
peerDependenciesMeta:
eslint-config-prettier:
optional: true
checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
languageName: node
linkType: hard

"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1":
version: 5.1.1
resolution: "eslint-scope@npm:5.1.1"
Expand Down Expand Up @@ -3201,13 +3186,6 @@ __metadata:
languageName: node
linkType: hard

"fast-diff@npm:^1.1.2":
version: 1.2.0
resolution: "fast-diff@npm:1.2.0"
checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
languageName: node
linkType: hard

"fast-glob@npm:^3.2.9":
version: 3.2.11
resolution: "fast-glob@npm:3.2.11"
Expand Down Expand Up @@ -5447,15 +5425,6 @@ __metadata:
languageName: node
linkType: hard

"prettier-linter-helpers@npm:^1.0.0":
version: 1.0.0
resolution: "prettier-linter-helpers@npm:1.0.0"
dependencies:
fast-diff: ^1.1.2
checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
languageName: node
linkType: hard

"prettier@npm:^2.3.2":
version: 2.7.1
resolution: "prettier@npm:2.7.1"
Expand Down Expand Up @@ -5837,8 +5806,7 @@ __metadata:
"@typescript-eslint/parser": ^5.32.0
axios: ^0.27.2
eslint: ^8.21.0
eslint-config-prettier: ^8.3.0
eslint-plugin-prettier: ^4.0.0
eslint-config-prettier: ^8.5.0
husky: ^8.0.0
jest: 28.1.2
prettier: ^2.3.2
Expand Down

0 comments on commit 318de92

Please sign in to comment.