Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6334626

Browse files
chore(lint): update eslint config
Update `eslint-config-prettier` to `^4.0.0` Add `eslint-plugin-prettier` Remove `git-exec-and-restage` Replace `prettier` script in `lint-staged` by `eslint`
1 parent f5f1711 commit 6334626

File tree

2 files changed

+32
-8
lines changed

2 files changed

+32
-8
lines changed

‎package.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
"cross-env": "^5.0.5",
4040
"eslint": "^5.0.1",
4141
"eslint-config-i-am-meticulous": "^11.0.0",
42-
"eslint-config-prettier": "^3.0.1",
42+
"eslint-config-prettier": "^4.0.0",
4343
"eslint-plugin-babel": "^5.0.0",
4444
"eslint-plugin-import": "^2.13.0",
4545
"eslint-plugin-jest": "^22.0.0",
46-
"git-exec-and-restage": "^1.0.1",
46+
"eslint-plugin-prettier": "^3.0.1",
4747
"husky": "^1.1.3",
4848
"jest": "^24.1.0",
4949
"koa": "^2.3.0",
@@ -62,11 +62,14 @@
6262
},
6363
"lint-staged": {
6464
"*.js": [
65-
"git-exec-and-restage prettier --write --"
65+
"eslint --ignore-path .gitignore --fix",
66+
"git add"
6667
]
6768
},
6869
"babel": {
69-
"presets": ["@babel/preset-env"],
70+
"presets": [
71+
"@babel/preset-env"
72+
],
7073
"plugins": [
7174
"@babel/plugin-transform-runtime",
7275
[
@@ -101,7 +104,8 @@
101104
},
102105
"plugins": [
103106
"babel",
104-
"jest"
107+
"jest",
108+
"prettier"
105109
],
106110
"extends": [
107111
"eslint-config-i-am-meticulous",

‎yarn.lock

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4170,9 +4170,10 @@ eslint-config-i-am-meticulous@^11.0.0:
41704170
dependencies:
41714171
eslint-plugin-import "^2.12.0"
41724172

4173-
eslint-config-prettier@^3.0.1:
4174-
version "3.0.1"
4175-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.0.1.tgz#479214f64c1a4b344040924bfb97543db334b7b1"
4173+
eslint-config-prettier@^4.0.0:
4174+
version "4.0.0"
4175+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.0.0.tgz#16cedeea0a56e74de60dcbbe3be0ab2c645405b9"
4176+
integrity sha512-kWuiJxzV5NwOwZcpyozTzDT5KJhBw292bbYro9Is7BWnbNMg15Gmpluc1CTetiCatF8DRkNvgPAOaSyg+bYr3g==
41764177
dependencies:
41774178
get-stdin "^6.0.0"
41784179

@@ -4215,6 +4216,13 @@ eslint-plugin-jest@^22.0.0:
42154216
version "22.0.0"
42164217
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.0.0.tgz#87dc52bbdd47f37f23bf2b10bb8469458bb3ed68"
42174218

4219+
eslint-plugin-prettier@^3.0.1:
4220+
version "3.0.1"
4221+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz#19d521e3981f69dd6d14f64aec8c6a6ac6eb0b0d"
4222+
integrity sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ==
4223+
dependencies:
4224+
prettier-linter-helpers "^1.0.0"
4225+
42184226
eslint-rule-composer@^0.1.1:
42194227
version "0.1.1"
42204228
resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.1.1.tgz#479dfd4e93d7f2777499a35ce9be76403c8e982a"
@@ -4553,6 +4561,11 @@ fast-deep-equal@^2.0.1:
45534561
version "2.0.1"
45544562
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
45554563

4564+
fast-diff@^1.1.2:
4565+
version "1.2.0"
4566+
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
4567+
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
4568+
45564569
fast-json-stable-stringify@^2.0.0:
45574570
version "2.0.0"
45584571
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -9697,6 +9710,13 @@ prepend-http@^1.0.1:
96979710
version "1.0.4"
96989711
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
96999712

9713+
prettier-linter-helpers@^1.0.0:
9714+
version "1.0.0"
9715+
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
9716+
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
9717+
dependencies:
9718+
fast-diff "^1.1.2"
9719+
97009720
prettier@1.16.3:
97019721
version "1.16.3"
97029722
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /